tree 25be69fac8f805d56df2172732a15661f4d1f59b
parent 80a6f0558b9ad4264b0c47de386aecc62e9f4525
parent 5fce345b14b5147c0e757bcf1a3fdc7dd70db22f
author Xin Li <delphij@google.com> 1579132638 -0800
committer Xin Li <delphij@google.com> 1579132638 -0800

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master

Bug: 146167222
Change-Id: I44c4fcf7b96d13ecdbcce4f79517f18a38c9726c