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