diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:07:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:07:33 +0000 |
| commit | e97d2b1c55ad240db3f2b46c2b5849ecd2236c18 (patch) | |
| tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 042567fe796b305c04470c02e0b91ac2871adb1c (diff) | |
| parent | 9f46f1be1305533406549a6ec3150067ab823132 (diff) | |
am 9f46f1be: (-s ours) am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9f46f1be1305533406549a6ec3150067ab823132':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions