diff options
author | Bill Yi <byi@google.com> | 2016-06-24 06:02:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 06:02:26 +0000 |
commit | efb204d54dbda6e665b62eea47be435d23dc21b3 (patch) | |
tree | 89b3178274dcfef8963b95eb34bbddb9b9953882 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 16afe88dc2c00ec397c2065da1ae5d9728b52e64 (diff) | |
parent | 3e9917dc918181e67bae06de42cb84a13a6836ad (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours
am: 3e9917dc91 -s ours
Change-Id: I10946d0fa4e33dfedb60c9f3a37318fd4adbd991
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions