diff options
author | Geoff Mendal <mendal@google.com> | 2015-02-23 14:26:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 14:26:47 +0000 |
commit | 84cd5f64c340067b1a8e3e7a7c7d1e86ca155313 (patch) | |
tree | 28c6862e9549255f59d36f195516f391e01f59fd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530 (diff) | |
parent | e74331dc0ef5393115a4381e98b860d80ddfe2a7 (diff) |
am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'e74331dc0ef5393115a4381e98b860d80ddfe2a7':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions