tree 19fe3572bd2f59e65cb8ca8d04693c5ba12229cd
parent 1ebc8978726e7413df59bf2b423fd0089de7b9ef
parent 5af5b037db03d4dcf159261ec87375f0afb98143
author Xin Li <delphij@google.com> 1575475650 -0800
committer android-build-merger <android-build-merger@google.com> 1575475650 -0800

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

Change-Id: Ia6ef910a5d17f1cf28e80503d2f9e12103350ca0