tree 86f2cefb6f6f6b1ab2137f063c0cb950944fa7aa
parent 74713bf7fe3fcdba3a1865b5b35a0c859b709a1b
parent 0bd628d967a4b54946a08673fb8ffd6be00cbd34
author Colin Cross <ccross@android.com> 1639687431 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639687431 +0000

[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -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: I1344fd107d54b7eef3f773d63cf5691939e1887f