diff options
author | Geoff Mendal <mendal@google.com> | 2015-08-06 04:36:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 04:36:41 +0000 |
commit | ecbd1cef9cf884f5d34ea36baa1c1496a48751ec (patch) | |
tree | a4ff61242744dcadc21421a9ff2e0b90b5d2df33 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0b09eefa35066e4c43300dcd5b38689c6114b1a2 (diff) | |
parent | 511cf5b88230910bac312f160e289650da896253 (diff) |
am 511cf5b8: (-s ours) am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '511cf5b88230910bac312f160e289650da896253':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions