diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:42:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:42:22 +0000 |
commit | 43c9b3eeac59842e8c8accfcfe2ad8934dd1c4c1 (patch) | |
tree | 938a6dd806ac939bd509c3bc130a58b1b0a4b196 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 16bea03a44f53b42781933551abc1d68b3f2edd3 (diff) | |
parent | a58143b41ce92c425dbdc0abd6a6961cf571a083 (diff) |
am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'a58143b41ce92c425dbdc0abd6a6961cf571a083':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions