diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 02:57:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 02:57:06 +0000 |
commit | 793f42875c105ac9f57695b28cfd2b2ae159d157 (patch) | |
tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 46db0f2215ad6e969418d1fedd1578445b46588f (diff) | |
parent | d159a208a4f1dbec522d8a0a5045a96fbe6d0082 (diff) |
am d159a208: (-s ours) am a64c3e57: (-s ours) am ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd159a208a4f1dbec522d8a0a5045a96fbe6d0082':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions