tree e97da1e891748d8ac9a922f3cf10fee1f83e8db4
parent feae59dd8d31bb2db6f848f3c8ac3abf2f5f7fd9
parent 004bb34a4a19e0a22df4ceb70d3fbe8b88d1df06
author Xin Li <delphij@google.com> 1572471810 -0700
committer android-build-merger <android-build-merger@google.com> 1572471810 -0700

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

Change-Id: I65825d6fe83ffbdffb1e6c2093cbd1eb52f21f1f