tree 4ba97625a85753b41d99b98071eaae1ddd5b4d69
parent 59150ebbb8186d10ab64a144d0c63e5223ff5a5d
parent da6adac8cfeae0562e48b263b46f1cfc604c6094
author Xin Li <delphij@google.com> 1572473722 -0700
committer android-build-merger <android-build-merger@google.com> 1572473722 -0700

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

Change-Id: I682637551ad4b4be00b3f4e076c961dc583e9e0b