summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/Trace.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-11-15 08:03:07 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-15 08:03:08 -0800
commitaaf3fbc665bf2252713afee7ef22536b590a71a2 (patch)
treec981fa8cf77f98ce1857c2ae8bc26bbd1ea2ae61 /core/java/android/os/Trace.java
parent020d65290a6fe7dc5465d36c259ec62dcfd71c1f (diff)
parent0a26a6ca82ffb63c35110a07b87f193f1e1af948 (diff)
downloadframeworks_base-aaf3fbc665bf2252713afee7ef22536b590a71a2.zip
frameworks_base-aaf3fbc665bf2252713afee7ef22536b590a71a2.tar.gz
frameworks_base-aaf3fbc665bf2252713afee7ef22536b590a71a2.tar.bz2
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Diffstat (limited to 'core/java/android/os/Trace.java')
0 files changed, 0 insertions, 0 deletions