tree c2cf4cd5026817483d7fb5cd6175d400efc9f912
parent b8360c58957ae656fe58807ea93209f3952d9805
parent f8d87e45610e16aaf374602d29f7fd9f5fe04dbc
author Xin Li <delphij@google.com> 1579132757 -0800
committer Xin Li <delphij@google.com> 1579132757 -0800

DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: I941f4f30e1ef0e3f8684de3a4e451f2791b42449