diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:07:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:07:46 +0000 |
commit | 54368ed0c2cde9172687a1b55d017243dfd1748b (patch) | |
tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 2434a36da2a491fa30aa81921207d633bee508a8 (diff) | |
parent | 560a15512fbfdf0fe4801fef0c22079caf94623b (diff) |
am 560a1551: (-s ours) am 78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '560a15512fbfdf0fe4801fef0c22079caf94623b':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions