tree adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b
parent 2a85b04ffd9ab5c6872ad57ab3a4c92b790dc887
parent a815250b76499810d5d281248e3293d72548ca07
author Xin Li <delphij@google.com> 1584746669 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584746669 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861 am: a815250b76 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifa7b6ec57c327f47b6007fcbe32299be00e12780