tree 3ed7928f67b78d15fde5300b5e2f203abe05f2ee
parent 96c5bba56a59a2a67e51c1b46e3877898963f0b8
parent 2e60b2b57834e38f26c34438ce2c0cb850335b1d
author Xin Li <delphij@google.com> 1572470635 -0700
committer android-build-merger <android-build-merger@google.com> 1572470635 -0700

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

Change-Id: I648e00794e28db2b5165f009c2afcbabc253fca7