tree 2939b610e453fb7a21774f749f7012c29622e940
parent 3449e09505aaf44972986343f2d7f92bc29d721e
parent 60cd73f453bb6d4920cf2d2aa3b0f455a404de04
author Xin Li <delphij@google.com> 1572475142 -0700
committer android-build-merger <android-build-merger@google.com> 1572475142 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 78bcfe5b90
am: 60cd73f453 -s ours
am skip reason: subject contains skip directive

Change-Id: Iefabd0b03ca12797cce14875a90ade3bde0b3398