diff options
author | Geoff Mendal <mendal@google.com> | 2015-02-12 19:20:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 19:20:42 +0000 |
commit | 615adb8bc80efa8c4b6d45387a500e8ab77bc692 (patch) | |
tree | e74bc72b50200ab15ce1c1514db58da12523165d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f69f3737ba8cb2acb481dc78de3c5275bae112e7 (diff) | |
parent | a673af77d95f4a3d46e5d71188256b27e06cc442 (diff) |
am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'a673af77d95f4a3d46e5d71188256b27e06cc442':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions