tree a498fc17004b9846fa254f4682d7f07421bd6903
parent 140b6ba4b49f3893a8064beaf7ed4fc4de8aa270
parent ea3b50b135544a6566c2d1e14a913d895fee448a
author Xin Li <delphij@google.com> 1572474893 -0700
committer android-build-merger <android-build-merger@google.com> 1572474893 -0700

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

Change-Id: I1b415a2f8d5a9371a20e8205f292b221b2c51990