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