diff options
author | Geoff Mendal <mendal@google.com> | 2015-10-19 16:08:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-19 16:08:22 +0000 |
commit | 06efcdc6bed934ac3c138a380728f6b11e051f28 (patch) | |
tree | e21a1bfabd92e2b3198339731697b990fd0cbaf7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 69988b3cee1df8fd1fee9ae2041a0981cc491bd2 (diff) | |
parent | e0f00d04d4d68348a8baf03f3c51521389aff576 (diff) |
am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours
* commit 'e0f00d04d4d68348a8baf03f3c51521389aff576':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions