tree bb45846dcfe7afde14934a347065c829ca7efaa4
parent f6739a65dd1ceeb050249070e9407890f713e30c
parent 6d5f9a965d245b03f78af5981a2c6f30a1f80c1a
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: Id15b02a54a94d8ab201d9971ae38c2b73f52487d