tree 16555c5e8e6421c68a77d3123983d59281328fbf
parent 631e6ec0e8f2b46f2ddf8b5f12af143094bc759a
parent 62645b0659e37d0bb4ddbbdcdf129a930c006675
author Xin Li <delphij@google.com> 1572552942 -0700
committer android-build-merger <android-build-merger@google.com> 1572552942 -0700

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

Change-Id: Iddfcc0d36e252f2db496bff92763ffc70dbc7413