tree d2869c733e26618e33e791ce3000a1e9a74758a3
parent 69f96f867171da067586bb2d133a05b3019559bb
parent 44cd649f2ec23c99bdb6d17e46affae9961ddf8a
author Xin Li <delphij@google.com> 1572461370 -0700
committer Xin Li <delphij@google.com> 1572461370 -0700

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

Bug: 142003500
Change-Id: Idf11e172899c261a9d39bff6fcace8ccee8d6d44