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

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021ce6 am: 72ac4fa778 am: 5e9126be41 am: f4d49c49c4 -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: I53907102228df600fb5bc8ae97d8a0f101cb03f4