tree 6ec7790e4462136e54844fa173ba38bede3a141a
parent c38674aafabcde52d600c1e584714e683d0bc2f8
parent e94bed9a0c5de410639397b7a7797e4cff251ca4
author Xin Li <delphij@google.com> 1584746671 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584746671 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 58d082ff97 -s ours am: 67012670f8 am: 10c9843bf3 am: e94bed9a0c -s ours

am skip reason: subject contains skip directive

Change-Id: Ibd7eb00792da5775943a4cd37fd472e777eadd0e