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