tree 33f05fcb02b39ce15aa202ac28ce3cbf9b405736
parent 27a15cd5ebab538eb598ec1c07b05e08dbee3538
parent 364883d819d55d173639d3747a204108c3582159
author Xin Li <delphij@google.com> 1572470458 -0700
committer android-build-merger <android-build-merger@google.com> 1572470458 -0700

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

Change-Id: I94fb532ec0da02e454f57c121b3ce06ea05fdacc