diff options
author | Geoff Mendal <mendal@google.com> | 2015-02-25 14:13:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 14:13:06 +0000 |
commit | 28e4a357ce341ccb535352708f241a098f22bbf5 (patch) | |
tree | 7728f264797be21d948fbea62723ad08ec8aa8c7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6d471d04b086d6d21b2e01f2368ec02af36d9970 (diff) | |
parent | c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64 (diff) |
am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions