tree c80c8df76cebcd3145c47db97a9a22f2fcc07c88
parent ce504b597e0d37803a74b02088be47a7e3a92ff4
parent b18b734b450ca43f71da2017207d7cdc20f96d9c
author Xin Li <delphij@google.com> 1572461444 -0700
committer Xin Li <delphij@google.com> 1572461444 -0700

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

Bug: 142003500
Change-Id: Iecbfb34019dfbaa82e7c7947c849deb67ceb4da4