tree ce202cbbfd6f17de3df40daa0951cbb6e073128a
parent cb7c76d2fb0da65d2be089d3b9d3e72ffdd27cf6
parent 2f56a5cccbfdfb3b443123d57a78a00a25ebe3de
author Xin Li <delphij@google.com> 1572473557 -0700
committer android-build-merger <android-build-merger@google.com> 1572473557 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7f296fb742
am: 2f56a5cccb -s ours
am skip reason: subject contains skip directive

Change-Id: Ia547d11768af8e2377bbe8f4f4c72f9b04d0a820