tree 0223b7b244ed4da87fb122f5f41ea04605a9eba0
parent a16b90efcf376df7dd41f1e112adebdb39dc3a4a
parent 334b9905b2c05d90be4f1364cf45317f9c680870
author Xin Li <delphij@google.com> 1572469192 -0700
committer android-build-merger <android-build-merger@google.com> 1572469192 -0700

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

Change-Id: Ic36535a2b3cb43b832196ff39910d7f0ba57c552