tree 36a8742c03906e83d3ba87670040ab9a6b07a4c3
parent 84292da6c291d6f36d5731fe7627b3e8a2fc62a0
parent 985633b7c7a7179aef366ec5ddc6eadca3734b93
author Colin Cross <ccross@android.com> 1639616236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639616236 +0000

[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" into stage-aosp-master am: b4bb645304 am: 3816453ca4 -s ours am: 985633b7c7 -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: I644b49eabf3f2f8f3d20ec3c52e54341038930b6