tree 3be194e71456bf4836b8dba5ae7bd53a3f93d873
parent b4bb645304b2a9bfb0c0d97d750c25cc32e457ad
parent 6faed50183b097424b36b781954c726a1a5716b6
author Colin Cross <ccross@android.com> 1639683640 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639683640 +0000

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