tree 85b6fe1f96ab9fe77c23dd4773dc56fb01ac823f
parent c34893823d1ff316e21f58f7871a57c01c480516
parent bc6b99f5aa7cf7f7f2124e570fb7a92fd37865d2
author Adam Cohen <adamcohen@google.com> 1591301295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591301295 +0000

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021ce6 am: 0b5bf8218d am: d7e97e2fc0 am: bc6b99f5aa -s ours

am skip reason: Change-Id I280025d9e58626fe725fe24ca60c28e89d0cee74 with SHA-1 f903d2c910 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11727216

Change-Id: I61c93eabf30b28f3bd80aebfe8476e856d8af2ff