tree 732d5d9344ac0df7996c2b2ff5f620ff5658b050
parent 29d9849fd7b8b49c26fe7e7bae0ba01e907dc1b7
parent b65058a45544ba4b9ff5dbad3cc306d86e9554e5
author Shimeng (Simon) Wang <swang@google.com> 1287510286 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287510286 -0700

am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread

Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'

* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
  Don't force ended when full screen video is returned manually.