tree 46febcb0373096312a862228f51e73dd9e2da562
parent 009a22db71a4383e57f5407b92f3e7b85b7c0081
parent 7942353ca5763b7db04eecbd62c5c9f723f585f0
author Xin Li <delphij@google.com> 1586487969 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586487969 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7942353ca5 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie2bd40473375c593fbbb17100b1474d9c8fe20d3