diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 02:57:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 02:57:13 +0000 |
| commit | b22c59e2f60e96e7ff2166ea657963c35cf7f29c (patch) | |
| tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 793f42875c105ac9f57695b28cfd2b2ae159d157 (diff) | |
| parent | c488631ef09849b8c054cab26c463a2be260adf0 (diff) | |
am c488631e: (-s ours) am cbf24e12: (-s ours) am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c488631ef09849b8c054cab26c463a2be260adf0':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions