diff options
author | Baligh Uddin <baligh@google.com> | 2013-10-16 16:36:19 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 16:36:19 -0700 |
commit | 9b1afd36bb7e56abf371e255c8addd2008fc8990 (patch) | |
tree | 47fe4828366077e4bc09ec7e9352cffb990206de /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b75fb2230678d443c56c499ef9b8d5977fb3c846 (diff) | |
parent | 90472ebd0d264d12ff0fe43e30480ae4bf55eca5 (diff) |
am 90472ebd: (-s ours) am 477af29d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '90472ebd0d264d12ff0fe43e30480ae4bf55eca5':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions