OSDN Git Service

am 0db354cb: (-s ours) Snap workspace back to screen on ACTION_CANCEL.
authorJeff Brown <jeffbrown@google.com>
Mon, 11 Oct 2010 18:29:27 +0000 (11:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Oct 2010 18:29:27 +0000 (11:29 -0700)
Merge commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88'

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


Trivial merge