tree f2ec9d9a0da7a4f83383e084ed8807440ff2c261
parent 58c34c21c27c8c2fb7eca78e9322bfbb6cc44cc1
parent 6bb1c31d3cf9b5f297c69064847ac8bf3b4eea17
author Xin Li <delphij@google.com> 1575418607 -0800
committer android-build-merger <android-build-merger@google.com> 1575418607 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 6bb1c31d3c

Change-Id: I0e0275b099f145248ca5c9e22e3062cf6e30a704