tree d6d4cf5c00d4d8df252f21686d91efa9fb811192
parent 172d3e855208ca0e866f7db8a9d9cc96b76d4b22
parent b3545651e2346f98b910d98430c31098feeb44e9
author Hilary Huo <hhuo@google.com> 1615580749 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615580749 +0000

Merge "[settings-pixel-search] Add slice timeout to avoid showing empty slice view" into sc-dev am: b3545651e2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608eca101b8e05385507063c77b75051956071b7