diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:17:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:17:43 +0000 |
commit | 2ab06bfe054178c708742376a6cadc0f49410a93 (patch) | |
tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d3958df3bc1deee06807dd33385a85532cf7b92d (diff) | |
parent | d88b143705da74c489d109a457cbad3312bfab10 (diff) |
am d88b1437: (-s ours) am 2f52c65c: (-s ours) am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd88b143705da74c489d109a457cbad3312bfab10':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions