diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:42:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:42:16 +0000 |
commit | 16bea03a44f53b42781933551abc1d68b3f2edd3 (patch) | |
tree | 938a6dd806ac939bd509c3bc130a58b1b0a4b196 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e2153b9741c7d9c3910c9355ae3bf6ec4f5c231b (diff) | |
parent | 0b97b8cf7954d76c5f6d6d21a7808bbcff524b99 (diff) |
am 0b97b8cf: (-s ours) am 64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0b97b8cf7954d76c5f6d6d21a7808bbcff524b99':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions