tree 5128cc4f5119fd44b8aca675762415eb9cc20ca7
parent 4454ac76572d79185f54f6f983c846ead7431b39
parent f553a58425c66a990dbc5f4579c976a0636fc573
author Andreas Huber <andih@google.com> 1260239577 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260239577 -0800

am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2

Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'

* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
  Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.