tree 1038e88eea5ca9503f4ae43cd8c24c60a85a92d0
parent 3e5b8d82e9d7a995a1e9a01c35bd9151a1441493
parent 989e34f8f898ae00e4f7b908574ffaa2f2232fd3
author Robb Glasser <rglasser@google.com> 1628199702 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628199702 +0000

[automerger skipped] Merge "Revert "[DO NOT MERGE]"" am: d6d67c99a7 am: 989e34f8f8 -s ours

am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Idec217b8c941cf24246453439ee205ee6ab3c96f