diff options
author | Bill Yi <byi@google.com> | 2016-06-07 02:24:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 02:24:50 +0000 |
commit | 02914bc95badcda08e8f0f46fa80b5ae5bc75f49 (patch) | |
tree | 927d2a8b81c5fcdf7eef777fd2792babce3d5f31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | abb74889982603f6070100033c8fa2b1eef3d8de (diff) | |
parent | ffe7746437e8f06cc7dd2571c3354973791c8a8a (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ffe7746437 -s ours
* commit 'ffe7746437e8f06cc7dd2571c3354973791c8a8a':
Import translations. DO NOT MERGE
Change-Id: I7716f7ee468653bf3dce0d739f611d572d4ba916
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions