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