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

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

am skip reason: subject contains skip directive

Change-Id: Ibd10dae46ba05720f2457d68ce56b68f78ba4342