tree 3073a24982237ff90511e377303e9976197f69b5
parent 7c2b149c649ff43ae54fd7e92dd4a9f960d587fa
parent e22e60744012e7c67a415ac3ed99f21828ba8cc5
author Peter Schiller <peterschiller@google.com> 1468363491 +0000
committer android-build-merger <android-build-merger@google.com> 1468363491 +0000

Merge \"Reset scroll position when all apps is reset\" into ub-launcher3-calgary
am: e22e607440

Change-Id: I87b2255711122bbea87f1cd32e2a17f1d69533af