tree 33d151b914cdb28e17e3febf0a284f22f04ed95e
parent 13ca467371e71b39f9fbc38b95504e7a0d5d6326
parent 0301f2eba391349f9c1dc00e18f769f7f47ce2a6
author Xin Li <delphij@google.com> 1575350723 -0800
committer Xin Li <delphij@google.com> 1575350723 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: Ic6c3e445a8a29e859af5cf898aa32e1c48cf9b7a