diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:42:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:42:52 +0000 |
commit | 9b552e34004747166ad3d0f0789fb54f3a7f3094 (patch) | |
tree | 27538a6101c75339440c743ff698bddea7539dc9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | dbb9f370b2ebc5f1f0276fd0af2f4bd93ab25594 (diff) | |
parent | 0d8e091ee615fd8580d52e238070e26c3b41c594 (diff) |
am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '0d8e091ee615fd8580d52e238070e26c3b41c594':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions