tree c26d1d915c8dd5e98eb80a35dc18bdaec9bffd51
parent cd2514f1e2c7076583aee099ad44cb522ece4c20
parent f32697bd79f6baa7dba6ea8cded4b491a813cecb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575478674 +0000

Merge "Merge Android10 QPR1 into AOSP master" am: 5728efac3d am: f32697bd79

Change-Id: I69895aced31c80be49310bead0e25605edb76220