tree 3bc9ff859ad24f12939d13f58b6866a471c8440e
parent 8051225caf800453a37a8ea67126ca5e030ca009
parent b2678a7826c0bb721cff8ee63ab10222150aeed7
author Xin Li <delphij@google.com> 1665082910 -0700
committer Xin Li <delphij@google.com> 1665082910 -0700

Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: I76a5283a4f4397f4b65420b8a9cd0455249c50f1
Change-Id: I7ae701a4b49b3ba2bd3dea7e13c282a14df4c688