tree 42aaff17f746a1267e8ba54efbaf640f26317613
parent 8ca468ca86ed8503176f19442c24fca74cc701f3
parent e7c9b74790a10ef58f165b32d0755831a8d93e32
author Xin Li <delphij@google.com> 1572478145 -0700
committer android-build-merger <android-build-merger@google.com> 1572478145 -0700

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

Change-Id: Iddd9eb9a8e6b6883208b6a13b24e43d323000526