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