diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-26 18:43:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 18:43:57 +0000 |
| commit | ad9889bbd92454d960c638da04fa6a649bc3f6ef (patch) | |
| tree | 9fe1b54e6921f3d7d55a06478f17dd49e9e08d94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 199d621c5fc994e323fa6b73c34729d48fc46c11 (diff) | |
| parent | 3efcd8da613184e58ea1b23d37c1ad3bd2a141ca (diff) | |
am 3efcd8da: (-s ours) am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3efcd8da613184e58ea1b23d37c1ad3bd2a141ca':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions