tree fd845444b59dfc72656b7781596e0b1a0662c4c7
parent afc87d309e00c36a60c11047d96b45e05e9ebce0
parent e2c68225d78c5646256f6dd79ae06c9da105ba2a
author Xin Li <delphij@google.com> 1572461441 -0700
committer Xin Li <delphij@google.com> 1572461441 -0700

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

Bug: 142003500
Change-Id: I190b6dcea3636b7e3150597b51dfc6fb7d6400ad