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