tree 91240c54aeeb27b6beba74a667f54dda2907d5a4
parent 57fadf1b76909fff0394ec5a0a7cae35ed42f8f4
parent 06055db0e84af2a47b0e7991a10cab6e3088b098
author Xin Li <delphij@google.com> 1575476126 -0800
committer android-build-merger <android-build-merger@google.com> 1575476126 -0800

Merge "Merge Android10 QPR1 into AOSP master" am: 4848226fab
am: 06055db0e8

Change-Id: Ia9e8e516ba0e56e6ea55d97ff0322f571b453ca1