diff options
author | Eric Fischer <enf@google.com> | 2013-04-30 14:05:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 14:05:33 -0700 |
commit | 36430ffedfdcddacc76884fe8bc6c69b05770c03 (patch) | |
tree | ab989a58a37927754311fb8421b73f900930b71e | |
parent | 6af02ed8bcc07eacc4c9731b67ca364063e2c92c (diff) | |
parent | 152d2acfd9b9254c725eaadf53ae148b44cf9397 (diff) | |
download | android_frameworks_ex-36430ffedfdcddacc76884fe8bc6c69b05770c03.tar.gz android_frameworks_ex-36430ffedfdcddacc76884fe8bc6c69b05770c03.tar.bz2 android_frameworks_ex-36430ffedfdcddacc76884fe8bc6c69b05770c03.zip |
am 152d2acf: (-s ours) am 8448c8f6: am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE
* commit '152d2acfd9b9254c725eaadf53ae148b44cf9397':
0 files changed, 0 insertions, 0 deletions