diff options
author | Geoff Mendal <mendal@google.com> | 2015-03-18 15:43:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 15:43:02 +0000 |
commit | 3b419c0f5c870960b11c9fde81e9eb8ea8976aad (patch) | |
tree | c6c28ccf7cd9479fc7b81843afd298931d8b6f73 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2e5651dbfd0dbea89657d381f48f0191d3b0558a (diff) | |
parent | c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6 (diff) |
am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions