tree c9cafe0b74a1cb7fdf9efacfa9d6813dbc385fa4
parent f10d3a04e5b3c60546dc1e36f15a1814ae66fc7d
parent 2687257c9881f44243924db7a064cff4f59fcc1b
author Winson Chung <winsonc@google.com> 1520274167 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1520274167 +0000

Merge "Revert "Adding a separate state for QuickScrub"" into ub-launcher3-master