diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-16 05:52:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 05:52:01 +0000 |
| commit | 7ef557764c27efc5766c849b4982c70d05864dfe (patch) | |
| tree | a9be8ce3874cbc25e1530a0b5bc74a01ddae68c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 49bb8cdc5ecf42bdb66d948a900bee10de1c8323 (diff) | |
| parent | e134ac1cece66293b31543948fbabc5b7fc64b94 (diff) | |
am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'e134ac1cece66293b31543948fbabc5b7fc64b94':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions