summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/Trace.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-11-15 08:16:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-15 08:16:31 -0800
commit389392590178fde1195c2c43f8c540eef5202779 (patch)
tree0531253b76c2ea162a9ebd919ff89e6505fb7298 /core/java/android/os/Trace.java
parent8264bd80f2f3bcf684176b6945968f978b337680 (diff)
parentc3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb (diff)
downloadframeworks_base-389392590178fde1195c2c43f8c540eef5202779.zip
frameworks_base-389392590178fde1195c2c43f8c540eef5202779.tar.gz
frameworks_base-389392590178fde1195c2c43f8c540eef5202779.tar.bz2
am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'c3b6ee6068f7970c2a7f9da6f784adc2e6b2bceb': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/os/Trace.java')
0 files changed, 0 insertions, 0 deletions