tree 46c51c47f7a66d7bf26c01982df3e48719ce575e
parent 636df899721d7da23fc792f20df29937e628ab2f
parent 17d58a83356ba568861b3aa391c5df915d33c0f1
author Andreas Huber <andih@google.com> 1256755036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256755036 -0700

am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2

* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."