tree 53a4b7109e287e4e9af8aa40ecb08b3c731b5417
parent a51f394504835d14342d0a5e766ac04f5fc06955
parent 3816453ca451804bd0f2ded84df2e868087561b7
author Colin Cross <ccross@android.com> 1639615817 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639615817 +0000

[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours

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

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

Change-Id: I99339ecb4faa457a2058f839d42502a98f5d1a8b