tree 7543cb927ad35233c20eada53b842f75e5312497
parent 4e63dc8a758515af3690b0fbe6cf5574b88a5c89
parent b0736fac73b0df95f18234a0494aea3f3fc6c735
author Adam Cohen <adamcohen@google.com> 1321554579 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321554579 -0800

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

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