tree 236cad670aa0ee2d57c2bf389554957d9e7e0a21
parent 6c8e4604cbfc9e92118d0a4d84306d8015115842
parent ba84d82c1d80abd16b655a07f1d94e83576c0a33
author Xin Li <delphij@google.com> 1572470685 -0700
committer android-build-merger <android-build-merger@google.com> 1572470685 -0700

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

Change-Id: If564d0fccc8f3dd23a37804985429a291ec8f303