diff options
author | Bill Yi <byi@google.com> | 2019-06-20 09:17:01 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-20 09:17:01 -0700 |
commit | 8dc6024b551ec6d2fb74945036ba8f1458c2d05d (patch) | |
tree | 675a04dbe6be2d4f1509b1a7a7356d3521fbb155 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7b1a4b0878bd0ce3c7f2448a067139b03ca4d3be (diff) | |
parent | cb455928c76cf02e383124072bba6ff5c253e239 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 212f775a21 -s ours
am: cb455928c7 -s ours
am skip reason: subject contains skip directive
Change-Id: I9fa0ab86cc4bc01155885ceec313668ab8cbfa08
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions