tree 5c3b87b21a271ea5909b70b88a598a6288910d40
parent 061df1a1c10eb717c73e244fdaa90916ab23f6fe
parent f681be949fbb326a24b7b3ae8d329f5f62d86f5a
author Winson Chung <winsonc@google.com> 1365099650 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099650 -0700

am f681be94: 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 'f681be949fbb326a24b7b3ae8d329f5f62d86f5a':
  Fixing issue where drag view is jumping when you scroll from hovering over an edge.  (Bug 8522679)