am 04cae64e: am e0f64aae: Merge change 24178 into eclair
am 04cae64e: am e0f64aae: Merge change 24178 into eclair

Merge commit '04cae64ed10454c549f19b22560459f36861d0c6'

* commit '04cae64ed10454c549f19b22560459f36861d0c6':
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base