am 486733c1: Merge change I94856f6d into eclair
am 486733c1: Merge change I94856f6d into eclair

Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp

* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
  Update <video> implementation after new IRC discussion with Eric Carlsson.

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