tree bc9b3c02ad3344f036ab6118688ea3224d3f9719
parent 3722d4710e15a880943abc1e98fc1de73323f0f1
parent edff60fd993793ec827b157ae613a90cfc6ac4fb
author Xin Li <delphij@google.com> 1572475116 -0700
committer android-build-merger <android-build-merger@google.com> 1572475116 -0700

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

Change-Id: I18dfc1cb95aaaea6c2daa49ee2cf07380d46dea6