diff options
author | Bill Yi <byi@google.com> | 2019-06-01 21:51:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 21:51:32 -0700 |
commit | 686c24bb5d208415a262355cc7c5c61e4ef9fcee (patch) | |
tree | f9612031be23c2be4a4b92817f37d6d3050dbcbf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 03e3ea94869eb533eaa7fbc0ec705c5de2980d21 (diff) | |
parent | f26f7053797e47f6f2040f1370608487b1b966b8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b3b93d72fb -s ours
am: f26f705379 -s ours
am skip reason: subject contains skip directive
Change-Id: I2833a56639af4a5b2bffffd0c32b9498efad1484
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions