tree dcfbc0ee49a50e10a71068cf18d6c92db85123c4
parent 9008e1ea5d347e8fb425c8b76f8027f357d1e190
parent c7a6c386db0ac44f6fc8461f483027234a04f209
author SzuWei Lin <szuweilin@google.com> 1585725126 +0800
committer SzuWei Lin <szuweilin@google.com> 1585735119 +0800

Merge branch android10-qpr2-release

Change-Id: Ibd4155644c21e3bd76dde4fd06e87d51764b7ffe