tree 7a0408415ec6f238c38a05722fb99b107758ed5e
parent 510338d92172a1a5c6cf875aea83b5f6c80b3465
parent 0db354cba9c29ea7bd5b736ae05f625a6acf8c88
author Jeff Brown <jeffbrown@google.com> 1286821767 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286821767 -0700

am 0db354cb: (-s ours) Snap workspace back to screen on ACTION_CANCEL.

Merge commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88'

* commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88':
  Snap workspace back to screen on ACTION_CANCEL.