tree 19fe3572bd2f59e65cb8ca8d04693c5ba12229cd
parent 21d3b89cc5a1717c9e952c9645219e6b9d1d371e
parent 8295228a79441224ad4d1b96c430aa2e99fa82ce
author Xin Li <delphij@google.com> 1575350701 -0800
committer Xin Li <delphij@google.com> 1575350701 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I630eb6403a72db8b7db6857d8c12284aa9ffa1ef