tree 41d2a7d7a77235f923ff60a1b43b7a498db91254
parent 6536e5468c0f9b2e9e5de92bea644671077e754a
parent 5575dfeaad45860f6b07a49a2571126b723454b5
author Pat Manning <patmanning@google.com> 1648779861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648779861 +0000

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

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

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