tree bc226757f3add826c67a9f47b1c8238efa294892
parent f0aa1936876519df04e213ced4929e2632222fcf
parent c7d12b9de8af94a70f2fe22179f388ed14f826d0
author Adam Cohen <adamcohen@google.com> 1321564831 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321564831 -0800

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

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