tree 60ed88972e9c3ba77e3470046ceda53c7702f7e7
parent f5d6e8c55f5653deb53a88fa11d27216d0efe3f6
parent eb3b5d800ac55cf63a5293211ee5ad3096b5be56
author Xin Li <delphij@google.com> 1586545631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586545631 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: eb3b5d800a -s ours

am skip reason: subject contains skip directive

Change-Id: Ie594ab880b38fed48017807c96cd10316d16e437