tree 9c1569d22ae4cb593c37744f4929c464ce329085
parent c37efd21d607739ff19daf0041fca06a985b86a9
parent 2d465aeac804544ed616ba3f5fe55fbe16167c2f
author SzuWei Lin <szuweilin@google.com> 1585726142 +0800
committer SzuWei Lin <szuweilin@google.com> 1585726142 +0800

Merge branch android10-qpr2-release

Change-Id: Id04497f9adc46724e72757d5c281a3ddade2dd5f