tree d97183c3280b99ee60ef74424c2dc8587620aa03
parent 24a49e2f917ba4edf76882258c75755ee4e4d72f
parent c62140bafd3d35abab89eb54a2ba43ddcf5d20a3
author Xin Li <delphij@google.com> 1572471805 -0700
committer android-build-merger <android-build-merger@google.com> 1572471805 -0700

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

Change-Id: I68c876385825bb3f17895de794d9ab81fde66b63