tree 4b3ec90616c7ebd1def4c5b68dc3a1d9c4de725f
parent 8014a899a10d2d0003eab1ea88e379b8a89c0058
parent e5ec49b51dfc35729f21165c60bc2d144dfe4db4
author Xin Li <delphij@google.com> 1584729145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584729145 +0000

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e5ec49b51d

Change-Id: I8a51a832ad2b439f09e8a4408542a9358b5b4333