diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-16 13:04:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 13:04:07 +0000 |
| commit | c84863bc2eb7ed182a7c9eaea5be8ec8ea2bcdb1 (patch) | |
| tree | f571749292893ee67cd3b7fa8c8b7f1ee25fc81f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cb5ebc25fe512d90c608ca5777de258a78aa6687 (diff) | |
| parent | 3fb3408b2ecdd601e93a2675ef0f81b15334ed0a (diff) | |
am 3fb3408b: (-s ours) am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions