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)
commit2b39855b9bd915205669559a7db48038971fdfd7
tree7a0408415ec6f238c38a05722fb99b107758ed5e
parent510338d92172a1a5c6cf875aea83b5f6c80b3465
parent0db354cba9c29ea7bd5b736ae05f625a6acf8c88
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.