diff options
author | Geoff Mendal <mendal@google.com> | 2015-07-20 16:06:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 16:06:38 +0000 |
commit | 753dc061075c3cd73af1bad508355c132944c694 (patch) | |
tree | 3d8c3ec50c3010b51098ae7d2d8c4cddc2f1e4cb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f3d1f3af76521e5d1c036016551c271c3112b8aa (diff) | |
parent | 34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859 (diff) |
am 34c7ef5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '34c7ef5d59961e1d7fdc1b14c9e46ea11cf15859':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions