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