diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:17:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:17:39 +0000 |
commit | 2d027aa6d41a72b84dfc0fa4e3e21fffbb5526f6 (patch) | |
tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0eec4e7b2d6d38c316f8df211f71ea37a823c446 (diff) | |
parent | fc47b77e0561735486c493127e2607a7719381a7 (diff) |
am fc47b77e: (-s ours) am 957457a8: (-s ours) am 861caaa9: (-s ours) am 462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'fc47b77e0561735486c493127e2607a7719381a7':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions