Merge "Rewrite VirtualDisplaySurface"

author Jesse Hall <jessehall@google.com>

Tue, 16 Jul 2013 20:29:29 +0000 (20:29 +0000)

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

Tue, 16 Jul 2013 20:29:30 +0000 (20:29 +0000)
author Jesse Hall <jessehall@google.com>
Tue, 16 Jul 2013 20:29:29 +0000 (20:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 16 Jul 2013 20:29:30 +0000 (20:29 +0000)
diff --cc services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
Simple merge
diff --cc services/surfaceflinger/DisplayHardware/HWComposer.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Tue, 16 Jul 2013 20:29:29 +0000 (20:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 16 Jul 2013 20:29:30 +0000 (20:29 +0000)
		1	2
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/DisplayHardware/HWComposer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history