tree 409c983762b4f6c2eb29b1393794baf2e8631dc6
parent a7c707f445bc5859c2c1a15ab0ded2baa443ac46
parent 9d09bfbf38bc7f157be55923b23bfa730d7b2073
author Adam Cohen <adamcohen@google.com> 1591226919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591226919 +0000

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f am: 9d09bfbf38 -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: Ic0a9bc6d7b65f114722594c28869680f2e34e571