diff options
author | Bill Yi <byi@google.com> | 2017-01-19 04:48:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-19 04:48:27 +0000 |
commit | 46db3c47d1bcef75645015931b27460857742177 (patch) | |
tree | 1c5a53836b6aaa3505f627ac5ef327c996614306 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e85770348a3bcdc103edf4e3c92895f7ecdde90c (diff) | |
parent | 9ba372781e8cb68f3ccb41642fb937e4be4cdcf9 (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9ba372781e -s ours
Change-Id: Ief80cc50b3ccd1879d8dfd8844a8c9ec2d3c5f31
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions