diff options
author | Baligh Uddin <baligh@google.com> | 2013-10-16 16:36:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 16:36:11 -0700 |
commit | 2d4cbc7a000a135e1bd757a51682c40949c5f754 (patch) | |
tree | 47fe4828366077e4bc09ec7e9352cffb990206de /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c724c28f3c60eee5bc946a7f71b941304972c525 (diff) | |
parent | 29c4161d55e7a69b3addcfeabeee8f0911a3f464 (diff) |
am 29c4161d: (-s ours) am fde69a53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '29c4161d55e7a69b3addcfeabeee8f0911a3f464':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions