diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:07:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:07:09 +0000 |
commit | d542fb052e939b6f1510debef5f8e5cc60dd21df (patch) | |
tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d88b143705da74c489d109a457cbad3312bfab10 (diff) | |
parent | 26d1a338431819d3c0ebb4fe7d4eb53e8735fc10 (diff) |
am 26d1a338: (-s ours) am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '26d1a338431819d3c0ebb4fe7d4eb53e8735fc10':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions