tree c3f62d267dd153e2885836ee0b75e27a5a4de8b5
parent 0edb45ac13b1fb5dd9a28e3842bbb6ed9f6a6b43
parent 9e22de7cb3a770ac99b9ee6fe2e52d7e3252a97a
author Sunny Goyal <sunnygoyal@google.com> 1471033962 +0000
committer android-build-merger <android-build-merger@google.com> 1471033962 +0000

Merge "Fixing overlay scroll state not getting reset properly when scrolling is was cancelled" into ub-launcher3-calgary-polish
am: 9e22de7cb3

Change-Id: I4cda26705c6344e26b43b608e3c3dc6c365b1fa3