tree 69a2c86b3a83566da04f7d0711a345b36cd5def3
parent a574098eb33b17e5a426474f53f507e1e9bff5ea
parent 298e4982d7a78e36d1faadb9e87a9ed6171cc6d4
author SzuWei Lin <szuweilin@google.com> 1585724035 +0800
committer SzuWei Lin <szuweilin@google.com> 1585733993 +0800

Merge branch android10-qpr2-release

Change-Id: Ie71f09c3328efd4ba80caa719aa9e0617ab49234