tree e0f0d0fd71d033e0ba11ce0c8f185ea091ca3850
parent 7a81c68515c620ab98941ec4da44b45ea79b9417
parent 3c7fff2691c68747233657a42531c05fc8a06b36
author Xin Li <delphij@google.com> 1575475945 -0800
committer android-build-merger <android-build-merger@google.com> 1575475945 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 61a4c3a49e
am: 3c7fff2691

Change-Id: Iabf23c8a35630a90b375a3932ef9e943ed420575