tree afae83ccd15be32ce5b978b617b34251fd149fff
parent 781d8c3841abcddcfb3dda9cce82b08a3733d8a9
parent fc75a8f48417374b106e28e032d5ea23d522a7e2
author Xin Li <delphij@google.com> 1572461291 -0700
committer Xin Li <delphij@google.com> 1572461291 -0700

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

Bug: 142003500
Change-Id: Id7d282e1751ac15da5fd773922b769d7b898e822