diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:18:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:18:29 +0000 |
commit | fc47b77e0561735486c493127e2607a7719381a7 (patch) | |
tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 544a2885838e38f4465d768c180b5d71ce5ff0ee (diff) | |
parent | 957457a8fac025b7a75669d48291be1a0f9c4450 (diff) |
am 957457a8: (-s ours) am 861caaa9: (-s ours) am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '957457a8fac025b7a75669d48291be1a0f9c4450':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions