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