tree 6659dcc4059089b12210f41728045f3e072d3d8b
parent 76b1c3134228637848d2c4de06c36f77cea35ac6
parent 112664b4ada23a340082746c93870a55f32d6a1b
author Xin Li <delphij@google.com> 1572470428 -0700
committer android-build-merger <android-build-merger@google.com> 1572470428 -0700

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

Change-Id: Ida722171e070568e33c257ca93c682a8208a9d49