tree 2b5837b769528abd1ae14740282bd1260cdfa55f
parent 1ceed51173e8b89981367424817688f5a67edd4a
parent 7d45a3ff9a042b6a112f96d3d87eea5e5ff2c8bd
author Xin Li <delphij@google.com> 1567985035 -0700
committer android-build-merger <android-build-merger@google.com> 1567985035 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ed56d56f58 -s ours
am: 7d45a3ff9a -s ours
am skip reason: change_id I7ac6c92e1b64ccf5860de04b17a448046e1af8fe with SHA1 be2c54c3e4 is in history

Change-Id: I8866ffef6a7434b10bd019e2faa3fd3949808f9f