tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 1e1d0acf648d789a1251065ff7a186d1f1a9670c
parent 2dd68ad63f3992846de3cfb4a51b17a5a4319295
author Xin Li <delphij@google.com> 1572474954 -0700
committer android-build-merger <android-build-merger@google.com> 1572474954 -0700

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

Change-Id: I1afa50cf1f9638962417036f581f322e92c97645