tree 270adef92e44570263e1cba449be6fea18cbfbb5
parent 482dc8a4b132faaab4654e5b8b5c0d33eb7cf428
parent 57fadf1b76909fff0394ec5a0a7cae35ed42f8f4
author Xin Li <delphij@google.com> 1572556189 -0700
committer android-build-merger <android-build-merger@google.com> 1572556189 -0700

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

Change-Id: I5e40a356ff583a93d317a3dff40598712841a4b8