tree 903a2c607d817ee3ae68de51129531de14df927b
parent 7613e8a4989f43b319a0504444e698f5072eacea
parent 69371e876f2e196a2e5e1a182caff3836fc6eee8
author Xin Li <delphij@google.com> 1572461273 -0700
committer Xin Li <delphij@google.com> 1572461273 -0700

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

Bug: 142003500
Change-Id: I44f7cb8ccfc0486e1c507e12aff8bf1409beac6f