Merge "Set the swap interval of virtual display surfaces to 0"

author Jesse Hall <jessehall@google.com>

Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)

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

Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)
author Jesse Hall <jessehall@google.com>
Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)
diff --cc services/surfaceflinger/DisplayDevice.cpp
Simple merge
diff --cc services/surfaceflinger/DisplayDevice.h
Simple merge
author	Jesse Hall <jessehall@google.com>
	Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)
		1	2
services/surfaceflinger/DisplayDevice.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/DisplayDevice.h	patch \|	diff1 \|	diff2 \|	blob \| history