tree fd3962c55527d38b8fe683e83a295eee1e05412b
parent 865e41c3ede8299fe0904619e04dc913b3e1d25e
parent 093fef6b5cdff666c92c9a3cad7a79408c2499c9
author Xin Li <delphij@google.com> 1572476587 -0700
committer android-build-merger <android-build-merger@google.com> 1572476587 -0700

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

Change-Id: If58ad8d06ece8926e5dd839d704719203cd28b93