tree 58ddb750f3c58a1ff73eec2820e267d3514586ea
parent 3bfc7cd56ba630aeaf1907442bc4b3df486dc4cf
parent 922216b0b0a57e56663dd480f908589cb8e5159d
author Xin Li <delphij@google.com> 1572475023 -0700
committer android-build-merger <android-build-merger@google.com> 1572475023 -0700

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

Change-Id: I3e6f129d6e394884591c7a26b7f9c98e32df1c00