diff options
author | Bill Yi <byi@google.com> | 2019-10-18 10:58:22 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-18 10:58:22 -0700 |
commit | e467327708644525b610f71024a101e37151a302 (patch) | |
tree | 1f88b70ab531711071ef59ec7359776f136b49fb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b019786efc25ecd5bbb2d27252aaf113d032d52a (diff) | |
parent | 8a201f044253d9faf6b82639457c078eed7bc239 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 8a201f0442 -s ours
am skip reason: subject contains skip directive
Change-Id: I4c801629ef658ea7465660208064ab50fc27201c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions