tree 8a7c664e7ad485b422d7f4d81222efc3d872eebe
parent 5d3393fdaf6c5cb0e34663dd9492507b259f77e9
parent f62296b70a61757e3034eaefdf0f8a6ad201860b
author Xin Li <delphij@google.com> 1572461283 -0700
committer Xin Li <delphij@google.com> 1572461283 -0700

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

Bug: 142003500
Change-Id: I67522db54ed4f291b96566d2b49153c211d034c3