tree 58ddb750f3c58a1ff73eec2820e267d3514586ea
parent baa8110d96a54b15dc6730ff8664c517a374bee7
parent 9ec8d890953f757d7e4aa819b5a820ba564d55f5
author Xin Li <delphij@google.com> 1572461393 -0700
committer Xin Li <delphij@google.com> 1572461393 -0700

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

Bug: 142003500
Change-Id: Ic17945f09a0e670aabf169e259d6b1622145b5d0