tree 625e585b362639d2e020f9d319c3387bffd95550
parent cad9a4b0468eb9611cc9b7d7b380d8af3fff8588
parent 9dba1f928021450f101013e03deacc9a0506772e
author Andreas Huber <andih@google.com> 1256850016 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256850016 -0700

am 9dba1f92: Merge change Ib482ce88 into eclair-mr2

Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp

* commit '9dba1f928021450f101013e03deacc9a0506772e':
  Revive support for video encoding in OMXCodec.