diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:18:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:18:01 +0000 |
commit | 4fb39dbdaac7983ce1962b7f6c14353630ecf933 (patch) | |
tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | bb22aa897d8ecea9eb989ba720e390a3934e851a (diff) | |
parent | 042567fe796b305c04470c02e0b91ac2871adb1c (diff) |
am 042567fe: (-s ours) am 0727c1bd: (-s ours) am 20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '042567fe796b305c04470c02e0b91ac2871adb1c':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions