tree 21c6a060e0cd1f382ef9e6c2f527072146998185
parent 3e04922204f4f1ddfe973d0b93058b56c9fe9c65
parent 89b5b918f006fffa83203a981055a754a8210128
author Adam Cohen <adamcohen@google.com> 1498581996 +0000
committer android-build-merger <android-build-merger@google.com> 1498581996 +0000

Merge "Revert edge glow effect and restore damped overscroll" into ub-launcher3-dorval-polish
am: 89b5b918f0

Change-Id: Ib288b01e72198b7ae1835ec83e8c279a3a061f41