Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp * commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71': Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp * commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71': Update <video> implementation after new IRC discussion with Eric Carlsson.