tree a29caa6846305a08775035878f2a273a27a3a637
parent a119866d10246124554cddb5980f0b068f92a6a0
parent c9d55c0dd03d4e6ecf56f860e78140b779fa54c8
author Winson Chung <winsonc@google.com> 1365099359 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099359 -0700

am c9d55c0d: Merge "Fixing issue where drag view is jumping when you scroll from hovering over an edge.  (Bug 8522679)" into jb-mr2-dev

* commit 'c9d55c0dd03d4e6ecf56f860e78140b779fa54c8':
  Fixing issue where drag view is jumping when you scroll from hovering over an edge.  (Bug 8522679)