tree 6068b4b9fbce32d98a52cd6ec284a418b310dc68
parent 18bf7467eac4adc181161f28687f386be5cf25ad
parent 6f6e0cbbd16ebddfd66d7976025479bf5d38d4fb
author Xin Li <delphij@google.com> 1568236027 -0700
committer android-build-merger <android-build-merger@google.com> 1568236027 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6f6e0cbbd1 -s ours
am skip reason: change_id I984acb3bb82c4280d3389f0efbfad18b424e293f with SHA1 5941341ddb is in history

Change-Id: I425313cb84194ebeef12249a8aa6565d59ef68e0