tree 0c0ecdf5b587c2a1c80cfed8d40c5aab3c0d7f46
parent 5fa4d87e8a0b7f85ef5cef84fa2caa190b77274d
parent 05eee3720e682f4ce5ce1153f0236cee12d3883a
author Xin Li <delphij@google.com> 1572478130 -0700
committer android-build-merger <android-build-merger@google.com> 1572478130 -0700

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

Change-Id: I157de1361de02f2a533c308254a0635fc4830599