diff options
author | Bill Yi <byi@google.com> | 2016-06-24 06:11:19 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 06:11:19 +0000 |
commit | 56feb5912b057a14d92b86e61aaf1eff105a6408 (patch) | |
tree | f06837098ea0de2139c6ccb4a96463ded1595a08 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5af5505e13dcc87126ace6657833d574fbb5bb45 (diff) | |
parent | efb204d54dbda6e665b62eea47be435d23dc21b3 (diff) |
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 2bc13bcdad -s ours am: 3e9917dc91 -s ours
am: efb204d54d -s ours
Change-Id: Ia193039a0683037413e808beeb3a551044b976d9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions