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