diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-12 18:32:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 18:32:44 +0000 |
| commit | 27a86e4b80ecb9fa14bf8366ccb7ef0c3ebe7877 (patch) | |
| tree | 14a66c7de7d41350453e4196839090f5d93f3641 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 81d6b3513513c4e9cb8b92156e7b73f2955d2930 (diff) | |
| parent | 3a289a2f973ce1767fa552e3fbb70acd952a82d5 (diff) | |
am 3a289a2f: (-s ours) am 29e963af: (-s ours) am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '3a289a2f973ce1767fa552e3fbb70acd952a82d5':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions