tree 0832b1592aa8200e0d8b30639bfea5813030a20d
parent ddcdd34e4ca7d8b3035423b2c740450325d3d15a
parent c78944d200cb347e366b1e9adfc0f7ebfe5d8a24
author Xin Li <delphij@google.com> 1572475180 -0700
committer android-build-merger <android-build-merger@google.com> 1572475180 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: c78944d200

Change-Id: Iac23323824d920d6023d2332a9a2739ec0c27f97