Romain Guy 190a0f24db am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev ...

* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
  Add async events tracing to android.os.Trace

2013-04-12 14:04:07 -07:00

..

java

am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

2013-04-12 14:04:07 -07:00

jni

am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev

2013-04-12 14:04:07 -07:00

res

Import translations. DO NOT MERGE

2013-04-12 08:55:42 -07:00

tests

Make download manager tests more reliable.

2013-04-09 15:08:43 -07:00