diff options
author | Geoff Mendal <mendal@google.com> | 2015-03-16 12:57:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 12:57:12 +0000 |
commit | e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7 (patch) | |
tree | 372aa2b4d785acc4d7e54488d648037f98491fa9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 51448a1a604ca7e4c8cedeb31d2907bcca524f6e (diff) | |
parent | 9a036229277479c0bc53d850ed5c98b8b69aa080 (diff) |
am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '9a036229277479c0bc53d850ed5c98b8b69aa080':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions