am 2637cb17: Merge "Allow OMXCodec to specify an output color format for OMX...
am 2637cb17: Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
* commit '2637cb17':
Allow OMXCodec to specify an output color format for OMX decoder component