tree 2dfdfd492f12e83f577d8c94eb1e2cadf4b3202f
parent 13252da94c05513899c8949a8305e995056d1664
parent 4fbf2a638a67c3ae368a25797149d4b59742271e
author Xin Li <delphij@google.com> 1575350706 -0800
committer Xin Li <delphij@google.com> 1575350706 -0800

Merge Android10 QPR1 into AOSP master

Bug: 145570283
Change-Id: If754c0b2ec765d62cb24dbe1287c0a14390169df