tree 8e8a4dc264ce989526cb4cde4bf56510b2aa5d6e
parent d5bc7a47d0ab9249076dcdf5a914fe9db68e7fb1
parent 5030445fd73638e60883b0a53bf0855eb5633c09
author Xin Li <delphij@google.com> 1575418374 -0800
committer android-build-merger <android-build-merger@google.com> 1575418374 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 5030445fd7

Change-Id: Ia02ca82673c61509a5c16080b30279691dfaf500