tree 41d2a7d7a77235f923ff60a1b43b7a498db91254
parent 750884b1a4471eb8cbea988d113a70b844d4d7cb
parent 4a113310925f23848e4bd38d7a7b2cb7dab5d404
author Pat Manning <patmanning@google.com> 1648781176 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648781176 +0000

Merge "Revert "Adjust edit state drop targets, workspace scaling, and m..."" into tm-dev am: 5575dfeaad am: 4a11331092

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

Change-Id: I442742dd7c15b7bc07e997688207d150fc960916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>