tree 278f1f83f97850983c363ec4d6b58fc39d3024a7
parent 0cf898fc346497ed16e6a2a228eb1d8f92bc1654
parent 996f96060ee8dc9c23ee956bc7a7343a07a28e94
author Xin Li <delphij@google.com> 1572461388 -0700
committer Xin Li <delphij@google.com> 1572461388 -0700

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

Bug: 142003500
Change-Id: Ic740af55bd514a2363f816521e3072b5b98d87e1