tree 269e085d6ada7d553d7b5a3339c05463d1eaa9de
parent 23b23b72c673955d87ed9945bfd242d0c717ed70
parent 4cd7092cc32f19246e10cfb81da46002123f6a65
author Xin Li <delphij@google.com> 1572461275 -0700
committer Xin Li <delphij@google.com> 1572461275 -0700

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

Bug: 142003500
Change-Id: I79f7319cd808e1c4752a8571c4be3a256ce9cc91