tree b59844e20becf9837900d1493c1b1541a4ca6f7f
parent cdf7b20ede334b05d3d4087ecc21d5876d15bc73
parent fb2c1170eda98727076b8a51d926417d438b8053
author Xin Li <delphij@google.com> 1584746666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584746666 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e7dbe95574 -s ours am: fdc3c68465 am: 5dffc15955 am: fb2c1170ed -s ours

am skip reason: subject contains skip directive

Change-Id: I34987249cca51e26f2b9da5594d87606ff9e9545