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