tree c5dc9195f7479351ef97a702ba8403c37df5d406
parent 7338ce29053842d95e83136b53efe43806e5f228
parent f2b775744b7202d1d315e1eba715731eaf00a872
author Xin Li <delphij@google.com> 1584729118 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584729118 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: f2b775744b -s ours

am skip reason: subject contains skip directive

Change-Id: I934f9ef30303c0657e1db8371d71d5f5c8b75a95