tree 7bf3b01c606857e76a4991a3147b2937f975586c
parent 9caed8c113bb88b08b20ac60a257b8e788896d3b
parent f7235ff8353f8fa9168c0c068ba893fa93c9c5f1
author Xin Li <delphij@google.com> 1575350710 -0800
committer Xin Li <delphij@google.com> 1575350710 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Idc57455180a9c257b1d72ee8b8d4056d1364131b