tree 2250d0ca95b1f4d9737844a407824a5914a4296f
parent 639e0bdf4f76d99e9959602238d22932efbeca1e
parent 3dfd2ebea7aab8b0ff7de4490fda107c7688b6c4
author Xin Li <delphij@google.com> 1572461409 -0700
committer Xin Li <delphij@google.com> 1572461409 -0700

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

Bug: 142003500
Change-Id: I5a38ffaf88357fa0a20b788883088321a5836efc