tree d087ef4546296cee64e517c7ec688a1463d0a364
parent 8754952e9ef84206d4247ca8e514eb9c7ebab7fc
parent 91f7a3e73581ab9a1ecd12ecb94fee4327126c46
author SzuWei Lin <szuweilin@google.com> 1585725460 +0800
committer SzuWei Lin <szuweilin@google.com> 1585735482 +0800

Merge branch android10-qpr2-release

Change-Id: I1377d4d5a95320d88cfeac9286e4dad40ef8bf21