tree 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa
parent c89a484add182e537db97628b91d326894ab9bb4
parent 76cdbb927f9b24dc9aff870b67841417627e9bc7
author Andreas Huber <andih@google.com> 1260982737 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260982737 -0800

am e065696c: am ae77561b: Merge change I7f11a67a into eclair-mr2

Merge commit 'e065696cd93a454877b44de9b96a033a7553b5ff'

* commit 'e065696cd93a454877b44de9b96a033a7553b5ff':
  Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.