tree f19f7c96987a51b14e9f509b32a2c66aa15bd0e9
parent 0e733ed366793746450ee6c2a9bda799d0c2a180
parent 0ab0175dedc811ddbf545c63bdfa5f7c90de12cd
author Sunny Goyal <sunnygoyal@google.com> 1472843909 +0000
committer android-build-merger <android-build-merger@google.com> 1472843909 +0000

Merge "Fixing overlay scroll state not getting reset properly when scrolling is was cancelled" into ub-launcher3-calgary am: 7bc4b5bcd4
am: 0ab0175ded

Change-Id: I967eff6f7042426ebf38bac1a9a8b9c1fda526ac