am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W...
am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '1955a5c9':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)