tree fd3962c55527d38b8fe683e83a295eee1e05412b
parent 6d51e11f9ada21c9db27133d1ddb731a209ad036
parent 423038f73ef823a6003b92c2193203e12efd6025
author Xin Li <delphij@google.com> 1572461401 -0700
committer Xin Li <delphij@google.com> 1572461401 -0700

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

Bug: 142003500
Change-Id: Id910d6092eab0b65d0c65ea8bf2ad2ae05526603