tree fa2736c30c7d5576a3e0206262a3704324ddb0ca
parent 79f26ec2aec87d525c5bdfba9abae3b8f5a5bdf6
parent afcb6aec27a52b87f3990691698ebe6b62e7a7bf
author James Dong <jdong@google.com> 1347642455 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347642455 -0700

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

* commit '2637cb172105939052d8a02f4eea693a90549518':
  Allow OMXCodec to specify an output color format for OMX decoder component