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

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

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

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

Change-Id: I42ed4b15e2861f718aa23f3eb2351135b154b054