tree ee604ccd9340f80f7e395f7a61a897fd15ae3508
parent 8051945f946b996e4185b30038a19e506caca7e6
parent 528f0a7c873bf72ed653e04c7078da48020d0702
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579199688 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579199688 +0000

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 528f0a7c87

Change-Id: Ic45939644d23e8eabe2ae67da4614092e5570750