diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:52:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:52:52 +0000 |
commit | 0882771d196468efad1e5350d0ba163c11e20b92 (patch) | |
tree | 1b65f274a1d48ddf9b2489d71c8fe6e6ead880d5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ed8ba7f90b42303deca05d396857aec032a880c8 (diff) | |
parent | b89ac616a050fa5efd12c9d5e034bd8780d0446e (diff) |
am b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b89ac616a050fa5efd12c9d5e034bd8780d0446e':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions