diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:11:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:11:52 +0000 |
| commit | 7a647ab30f9b3e6e0a9d890c7bfddb10015e0f4c (patch) | |
| tree | 2b0443778f446ed62174af3633d69cf14fe3e540 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fddd7ead7c92fff87edcc6f0a7d8a1ad6a9a18d4 (diff) | |
| parent | a01f5457bc819fcb48ba1bae1849f54138510ea7 (diff) | |
am a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'a01f5457bc819fcb48ba1bae1849f54138510ea7':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions