tree afcd76f4657bc76695040042590a55d7dfcd5e0c
parent db6dd102164ef271a407aef5a22b4d991d415d80
parent 888d4d2118706c7d5f96da163b8e2a9b6c9d8468
author Xin Li <delphij@google.com> 1572461266 -0700
committer Xin Li <delphij@google.com> 1572461266 -0700

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

Bug: 142003500
Change-Id: Ib549247c9f04c44a2a48a826934a47fc24771084