diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-17 15:38:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 15:38:33 +0000 |
| commit | a79f074b760bf6ec0c9a41c8ca7f7cc946317b6c (patch) | |
| tree | b70387a84ee3a1aba57765e801c8ba78cf65cbb3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 58d080e1a22ca1c358d1cd2f0b60956a2a8bfc98 (diff) | |
| parent | d1b3f15b4a9dcd23388ca1ae6793639fa5fcf216 (diff) | |
am d1b3f15b: (-s ours) am 13f57b84: (-s ours) am 0de82370: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'd1b3f15b4a9dcd23388ca1ae6793639fa5fcf216':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions