tree f09233dd2dabee59c9c40d580bda1cbe183621cf
parent 0f11d42de356c8f4e8963052f8a6c6f9f29a96a5
parent 42b79fa5bde2baec00718210f498bbbfac6516ce
author Xin Li <delphij@google.com> 1572553011 -0700
committer android-build-merger <android-build-merger@google.com> 1572553011 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 42b79fa5bd

Change-Id: Ie88a7772bbb04399e4a72f692403de38c3c71639