diff options
author | Geoff Mendal <mendal@google.com> | 2015-05-04 14:53:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-04 14:53:50 +0000 |
commit | ffdbf7da246ccc9fe9722c1e3fca84f97f96dd88 (patch) | |
tree | 02cd6668805200336e1f80559ed4a7d80b9dbe7d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 10dced7a92fd3bc26284efdfaacdea2610cc3bed (diff) | |
parent | cf1f2ea5a7945dc4982b1e41197af94ad64e8f37 (diff) |
am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions