tree add2b0c8322d398f566c1ff48d6170c269106617
parent 20666195117349aeacccd949ff05fba6f9f28974
parent 5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8
author Tony Wickham <twickham@google.com> 1459992750 +0000
committer android-build-merger <android-build-merger@google.com> 1459992750 +0000

Merge "Stop animating highlighted page border in spring-loaded mode." into ub-launcher3-calgary
am: 5b9a6e3

* commit '5b9a6e3f399e645bfcd7e5a1cd74753309fad1c8':
  Stop animating highlighted page border in spring-loaded mode.

Change-Id: I4a390976250ad198db1fccf4bd68802e84701a11