OSDN Git Service

am 02654f01: Merge "On this particular device the hardware video decoder spits out...
authorAndreas Huber <andih@google.com>
Thu, 7 Oct 2010 21:02:01 +0000 (14:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Oct 2010 21:02:01 +0000 (14:02 -0700)
commit9da1364f328fe6ba8938cee1bbb1c2a5e018a0e7
tree19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa
parentd5f3d15f2dff467699f639c41c1caa5ac47dccad
parent14fc691358232d234300046a67aed3dd62cbba43
am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread

Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.