tree fe29d592ead09761444f11727d820e7bd32884ff
parent 064629af315bca144e70abaff4886c23d8890cac
parent 9cde419ee064a1c7721977eba541ed7a7cf5a3d8
author Xin Li <delphij@google.com> 1614818419 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614818419 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09b5 -s ours am: 3aa15f3f6b -s ours am: f053b13529 -s ours am: 9cde419ee0 -s ours

am skip reason: Change-Id Icc96bfa8a3d59a19194a154baeaffaea1281af0a with SHA-1 3be35ec269 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdeef8576ec8bdc311198d8b0643b48aa78453fd