tree c387eb13b81f7006b9dac7fdc11977a5a20862ee
parent b9253508a96eb06a79b806598c08070db535a01f
parent 5d537229286a63cf28084a7e83759b9afa18bf89
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579201260 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579201260 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: d49125ac29 am: 5d53722928 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd82cf823d3e5848d3ad508d20f2ab98d5ad36f2