tree 0af464ceed8d55bc021fc70cc976f0858c7e757e
parent 080ff36715e6f2ac858842204736543c2ba8141a
parent ed2e462ec04cd0bf0277a38912a1ab58cac29b1a
author Adam Cohen <adamcohen@google.com> 1591227677 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591227677 +0000

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: 9d09bfbf38 -s ours am: ed2e462ec0 -s ours

am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0a1 is in history

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

Change-Id: I9b295c6b9d35dd4c918dd7519594c8c6a48454db