tree 8b3c8f3f7f0dde7a374c2e659b975d5ff6581968
parent 5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2
parent ca404dfb920ab009cef4db5e74715b796f79b3f9
author Andreas Huber <andih@google.com> 1256188912 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256188912 -0700

am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair

Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2

* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.