tree c59b7d18b0f5c5194a8e2d5ff24920f8c278f238
parent e9cfba25850777eda643ebc99a8675b93f9fdf20
parent d7b108300ecb0b669d6be1653e77adef2f7cca4a
author Xin Li <delphij@google.com> 1572470519 -0700
committer android-build-merger <android-build-merger@google.com> 1572470519 -0700

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

Change-Id: I256adb7bf2d9c870f57ffe850ac30f9c4b16d16f