diff options
author | Geoff Mendal <mendal@google.com> | 2015-08-12 18:09:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 18:09:21 +0000 |
commit | b689d776bb5c3b8cc8778813db4b308acd9a7f61 (patch) | |
tree | f69ac7598308e2d45edd5bc0d655699c8d82f154 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6379ddbe5a4b3d495d5cab3ff22c61c16ff2b4f7 (diff) | |
parent | 9e47ba6e06ad382361f166f26f4da5268f11f4aa (diff) |
am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9e47ba6e06ad382361f166f26f4da5268f11f4aa':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions