tree 19fe3572bd2f59e65cb8ca8d04693c5ba12229cd
parent 8295228a79441224ad4d1b96c430aa2e99fa82ce
parent 2a9ddbb10898c643b5e1bb02900a137ebb0d880b
author Xin Li <delphij@google.com> 1575418043 -0800
committer android-build-merger <android-build-merger@google.com> 1575418043 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 2a9ddbb108

Change-Id: I2adee5408e91984a7bbd357a7b925155c496c028