tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent b9958da552dd119314dcdba54e33085db576773c
parent bc2c9655740ce55a8f32476bffd28e8a5cd5d398
author Xin Li <delphij@google.com> 1584729112 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584729112 +0000

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

am skip reason: subject contains skip directive

Change-Id: I684255cf8384fb3ab8707af5f05639444f75c617