tree e7c170deb868f3b383b5f4fb53256eb87873e7a8
parent 3e1c1ff644798bfdc8e7b19220743ce2cdc92b9b
parent a160e2bc78d28d9bbe34d9760bbb3c7194f89fcc
author Tony Wickham <twickham@google.com> 1562892495 -0700
committer android-build-merger <android-build-merger@google.com> 1562892495 -0700

Merge "Defer jumping to NORMAL state if overview is still peeking" into ub-launcher3-qt-r1-dev
am: a160e2bc78

Change-Id: Ibe9a565a4a69b05a58cca480c7feec4094a4cdda