tree fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98
parent 09dc9b073f55cad744d57dff2ca02f62dddeff6f
parent 99e78ac95fc13cdf0f1e4036be0faca423f4c439
author Xin Li <delphij@google.com> 1572461248 -0700
committer Xin Li <delphij@google.com> 1572461248 -0700

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

Bug: 142003500
Change-Id: I809fba949d51f01395793ccb36118e4f5c42e5be