tree 6a561f5379c73c4eb7ba64915284437755028320
parent fbfcdaf2a54e6c0c4a3801cc2b2d95ba021f98a0
parent 53c08c16076765f880e7c1d55572c17d1ef6a29e
author Xin Li <delphij@google.com> 1572461419 -0700
committer Xin Li <delphij@google.com> 1572461419 -0700

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

Bug: 142003500
Change-Id: I350fd7dceb8166c6493ad8e5837fb926f33f7760