tree 210a8353eda03643d0ccae54770dc7da0db8ef5a
parent 4e2bae5228f6c7483e3539cd3b0953a56b830dc7
parent d2e25aa6dd721ff8f377c849d92d287502176725
author Xin Li <delphij@google.com> 1575475759 -0800
committer android-build-merger <android-build-merger@google.com> 1575475759 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 2b65793cd6
am: d2e25aa6dd

Change-Id: I3bf58b1afbff9e0a40106771a9f389b1e2c1b940