tree 2a5e06dc7dbbcf0d6a4cd8f44bbb3d99b47fac44
parent 3b4173b88098324bf217d61deb2228405533893c
parent 1b249f7c858ff9f093e06de8db0fff8e99574c15
author Xin Li <delphij@google.com> 1586549216 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586549216 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: a0a308b353 -s ours am: 1bb47f45b8 am: 1059c07da3 am: 1b249f7c85 -s ours

am skip reason: subject contains skip directive

Change-Id: Ide0cb64441c29fcd00ecf8e6be131b99ba206223