tree 28ce16b16a7e52db33e3f6e094e396893e0d2001
parent b0558dada3861646e385b12edeedbc6255380d66
parent 52402696fe0dcccd6cb931c9a65342c5ce037370
author Xin Li <delphij@google.com> 1572470504 -0700
committer android-build-merger <android-build-merger@google.com> 1572470504 -0700

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

Change-Id: I858491c4fe5e97cd43d95d535f017122a1aa8616