tree fb1bbd684308fc7bfed7d52fa731cac438b88110
parent adfc2526aafb5bc834d134bd087d41dd8672f3b4
parent d98610937f8eeed236805ffa9c7dab8c084e23be
author Colin Cross <ccross@android.com> 1639688383 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639688383 +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 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: I8912495f0159a9ead2548f698f2b7a6897a53ade