tree a05226c9b2287555640f6894365da416953846f9
parent f5a264a639d7baaf4d35a23745898bddc454c737
parent 52d459b6450030d973a523cb45a77562a1f15770
author Xin Li <delphij@google.com> 1575418161 -0800
committer android-build-merger <android-build-merger@google.com> 1575418161 -0800

Merge "Merge Android10 QPR1 into AOSP master"
am: 52d459b645

Change-Id: I75e5f3874ad03550f5985e89a863481d7d543b63