tree 47a3fe0b91dad2d537a2177464972723715065c5
parent 3ea325f4c646dc6bc23321e984285e8f3e9705d1
parent 7df0c7355ec191604394f900269c87e1887a7a26
author Xin Li <delphij@google.com> 1575350714 -0800
committer Xin Li <delphij@google.com> 1575350714 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: I66939e99a25acc1e6d7e66d2b74959b1fcfcc1ad