tree c686364b112568c3661026b338133878220886a7
parent d1c3b3c146cc0d4b8ae6b9a326c94fb48d4f2bb8
parent 06741c7e6488c74c5f95f0638127fe276b445a13
author Xin Li <delphij@google.com> 1575417984 -0800
committer android-build-merger <android-build-merger@google.com> 1575417984 -0800

Merge Android10 QPR1 into AOSP master
am: 06741c7e64

Change-Id: Ie5c3bfdac14d2fba7aadac4ecf62bade456b2ef2