tree c097a08b637cc51174e6842078f1beb7b6815257
parent 4ad9ad3872aa1d7ddc1a3382525d9406418fbef4
parent 79c2486ee46a65264f70cb4573c044d6381580ec
author Xin Li <delphij@google.com> 1567979093 -0700
committer android-build-merger <android-build-merger@google.com> 1567979093 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 79c2486ee4 -s ours
am skip reason: change_id Ibe4f862f95d9dc94c69529a1e8179beff08a0c2b with SHA1 478eb8d9a1 is in history

Change-Id: Idfaa7c004f350945b86b2707939463aeeb212cfe