commit 72662b1abe7e76f5d880ffc44c561b3af63f89ad
author Andreas Huber <andih@google.com> Sun Oct 10 11:16:01 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 10 11:16:01 2010 -0700
tree b2ecf72154e1d23fcb1d96b75c9affdd44ead4b4
parent 7a2eff1fc79f3594ea4ef0f1c6aaa7a1d914dd1b
parent 45bd1159fa34b51ba077e0cde760d171ca092552

am 45bd1159: 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 '45bd1159fa34b51ba077e0cde760d171ca092552'

* commit '45bd1159fa34b51ba077e0cde760d171ca092552':
  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.