tree bc226757f3add826c67a9f47b1c8238efa294892
parent 48ad49a8124f9ea0ea5eead2a27aade168b0225f
parent 6d1c4ff2f3736e7f6da2a1c43e8c45af4b1a4900
author Adam Cohen <adamcohen@google.com> 1321565185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321565185 -0800

am 6d1c4ff2: am c7d12b9d: am b0736fac: Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1

* commit '6d1c4ff2f3736e7f6da2a1c43e8c45af4b1a4900':
  Fix hiccup when dropping in springloaded mode on large ui