tree 3934713b8fb374bf07efa2bc1574f8a77e2f1f5c
parent 0b1a9f7648a9e57b0eaf6766f73810de94136669
parent 5921fb51e0219ddd7cad439a73495f320c57d50e
author Andreas Huber <andih@google.com> 1260208866 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260208866 -0800

am 5921fb51: Merge change I91eb0354 into eclair-mr2

Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp

* commit '5921fb51e0219ddd7cad439a73495f320c57d50e':
  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.