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