tree 82b9d61f2abfda1b31304081f3472dcb474fa128
parent d791382c601faf91dd4eabbeedba2a1f9495c135
parent b310a85db7ae5aab45af8076f83b3587da5bb783
author Colin Cross <ccross@android.com> 1639689447 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639689447 +0000

[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -s ours am: d98610937f -s ours am: b310a85db7 -s ours

am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history

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

Change-Id: I78e21011d339383b18b6b8a2a54e01aabb893c1d