tree 90b860ae83295a988a4abd3eaf022e45a70e86be
parent c7e46349d26a75824457ef9f5e9e67f2a63a7a8c
parent d4eef49c06e101e14346449c551339e5ba5255eb
author Xin Li <delphij@google.com> 1584729112 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584729112 +0000

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

am skip reason: subject contains skip directive

Change-Id: Ia0c335d109d514a265db752851ccba57ff5376ea