tree 4a55778ad6cd0b4aaad13e376160e8c36b3e544b
parent 846567574fb924926d6b3d3f9b11aa78d0da988d
parent 1ee1330da83b5018390a8ac81ef977153e6b78a0
author Xin Li <delphij@google.com> 1567985538 -0700
committer android-build-merger <android-build-merger@google.com> 1567985538 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0c68d39470 -s ours am: 60659ce9be -s ours
am: 1ee1330da8 -s ours
am skip reason: change_id I0dcb6b2b9015a6545103a267584dbaf45fdf213a with SHA1 ca61a6269b is in history

Change-Id: I91c89ab721ebd491bedf3badd196f35b9b258d59