tree b36dc83c3175ee21a0a3442078dc42a8fa3d3aba
parent 6ced5a9a5afe6bdebb4fbdc8fc30816340476577
parent 76f106a3f3b8794d99365e8c1fe1eeb971a4379d
author Xin Li <delphij@google.com> 1584746677 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584746677 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d am: 059c27ce5a am: 76f106a3f3 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib2159c9f03d4f0ecf77c48af476c78930b36792e