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

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