diff options
author | Geoff Mendal <mendal@google.com> | 2015-02-25 17:12:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 17:12:00 +0000 |
commit | 336beed4d1006211139ab0b8e34227b364f17899 (patch) | |
tree | 6182b2630b2254a6ad010ecb6a77aa8cc5fcf385 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9d695da8851298858c1280bf7fb7b44f78b501a2 (diff) | |
parent | aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00 (diff) |
am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'aee4a86a049c8c427a5b5f2d0d8ab0e6be520f00':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions