diff options
author | Bill Yi <byi@google.com> | 2016-06-24 05:57:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 05:57:49 +0000 |
commit | 7106fcc96b176b055b54f57e53d24dcd0517c8c6 (patch) | |
tree | 89b3178274dcfef8963b95eb34bbddb9b9953882 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 17b41e14bca540a6e858b5d986bf20ef3fcbef37 (diff) | |
parent | b8f7854c9a8bf5adb4fec8114d29fdd32e4a4699 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours
am: b8f7854c9a -s ours
Change-Id: I71b65664e5aaa02b36d752a9b57c17281225f115
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions