diff options
author | Bill Yi <byi@google.com> | 2016-06-24 05:53:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 05:53:16 +0000 |
commit | b8f7854c9a8bf5adb4fec8114d29fdd32e4a4699 (patch) | |
tree | 53520341ae54ed03a5a26b54a8b40d3bcc0de861 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fe45e68667bc033fab9fa6d5902e4274575037ab (diff) | |
parent | 2bc13bcdad6aef46297c5608c3828271d27f8037 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 2bc13bcdad -s ours
Change-Id: I2ff90e0c847b2c99099509802e0b5be4eaa04cff
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions