tree d63135df0e611e34319dc4f50f04fa715a1a17bf
parent 4b2832a30c74781cf77e29c7189852f3feff3abd
parent a909ab89beaadf2485eabb258a9f2bfe193a24ff
author Xin Li <delphij@google.com> 1572555733 -0700
committer android-build-merger <android-build-merger@google.com> 1572555733 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 40a724f175
am: a909ab89be -s ours
am skip reason: subject contains skip directive

Change-Id: I84c6fd6c55db5f4d0b900b38f2adec755d408e84