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

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: a203a72143 -s ours am: 2fb63ca806 -s ours am: afd6a98f9d -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: I9bacf508ca71fd31c16e7475ae9600d36b98b23e