diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:42:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:42:28 +0000 |
| commit | 68aefeeb50f4a72cd046f6ec2d4fdc8e42ed69bd (patch) | |
| tree | 938a6dd806ac939bd509c3bc130a58b1b0a4b196 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 43c9b3eeac59842e8c8accfcfe2ad8934dd1c4c1 (diff) | |
| parent | c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5 (diff) | |
am c31d6b70: (-s ours) am d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions