diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:08:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:08:01 +0000 |
commit | 5c3ea10c7ba46e33284ceb4d363e4a304dabc131 (patch) | |
tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 957457a8fac025b7a75669d48291be1a0f9c4450 (diff) | |
parent | 331c3ec7835044aa9bc6da22bae71695920aae62 (diff) |
am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '331c3ec7835044aa9bc6da22bae71695920aae62':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions