diff options
author | Bill Yi <byi@google.com> | 2019-08-04 02:46:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-04 02:46:45 -0700 |
commit | ef4a1f32dece8a5096fd6705fe66603e0637edb1 (patch) | |
tree | 4a5dcd3fc8e9b956388f0b73a507649439ab87e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 50424fa0fbddf5087b4c24e817fe10b528ff573f (diff) | |
parent | a832fa895bebbdd2f5ce4eff1a24724283a6f0b5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours am: 358c2af533 -s ours
am: a832fa895b -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1acc2f9220c7a594458a067192b3dd78ab1063e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions