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