diff options
author | Bill Yi <byi@google.com> | 2017-08-01 08:01:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 08:01:48 +0000 |
commit | 3f3ef090cecb33ed811fc372cd1cc76027a5e119 (patch) | |
tree | f21d1830c5f32e92ba28ce4f0194e4a7119c5965 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 486f6f0b65d4793c9a5932deed705eb8adc57a99 (diff) | |
parent | 63cfdfc02e306e81df69bbe1239747c5cfa588f8 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours am: fb80235f41 -s ours" into oc-mr1-dev-plus-aosp
am: 63cfdfc02e -s ours
Change-Id: I6977fe67408072320b65b5d03aee0dac9c1b8a12
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions