Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb

author Mathias Agopian <mathias@google.com>

Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)
author Mathias Agopian <mathias@google.com>
Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Mathias Agopian <mathias@google.com>
	Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 15 Jan 2011 03:27:38 +0000 (19:27 -0800)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history