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