diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-08 14:43:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 14:43:10 +0000 |
| commit | c61bd18d2b33ba12bedde61002b60086c2b0fd6b (patch) | |
| tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ba5740fd914de5e14fbe7f32ca149d87e19ebeda (diff) | |
| parent | cc92ae9871acdb4d15e2badbfe37e8cdebffe639 (diff) | |
am cc92ae98: (-s ours) am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'cc92ae9871acdb4d15e2badbfe37e8cdebffe639':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions