tree 48c837bfe0e5a8e7e27afd889f2adf73b022e0b1
parent e76e1e564a14ca14e093c8431ff4a61a73a6046a
parent 20a7cfbd3c96c328ba0346d7ab7aa0256c3a6bf6
author Hilary Huo <hhuo@google.com> 1615579118 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1615579118 +0000

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