tree 0ec013b648cebf24d9a5c442df5eb532799df28b
parent e5a5afb9df3a1149fcc70ab67bf5d9ac46bfc1ec
parent 1e6ce31142dc920f43c1f5f189d3a23cfc9bc6dc
author Xin Li <delphij@google.com> 1572553301 -0700
committer android-build-merger <android-build-merger@google.com> 1572553301 -0700

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

Change-Id: Ie9e455c69c574b4f22f65c91a82305d95638f508