diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-16 04:02:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 04:02:30 +0000 |
| commit | 1df29f0889f3615e50dd74e8138b4600528843c5 (patch) | |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 144c0fe9b8dca2e3c77f5d312f23d1bc63eb9d8f (diff) | |
| parent | 7969be0bb858c2fdc69b72f7c8f90f1dcdba3395 (diff) | |
am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '7969be0bb858c2fdc69b72f7c8f90f1dcdba3395':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions