tree 64ad6f2fc6c535eb54e19952e49b7cb909fbfb61
parent 1c4d9b9d258e3ca2232965777763ab2c71f49174
parent c873a4723142ba487e59c7bbd64c3e832894f88f
author Xin Li <delphij@google.com> 1572553204 -0700
committer android-build-merger <android-build-merger@google.com> 1572553204 -0700

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

Change-Id: Ic6d6b2eced45d1ce5f0ac142bece9befeaa19717