am 514e30a9: am c3d1889e: Merge "surfaceflinger: skip composition for empty frames...

author Jesse Hall <jessehall@google.com>

Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)
author Jesse Hall <jessehall@google.com>
Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)
diff --cc services/surfaceflinger/DisplayDevice.cpp
Simple merge
diff --cc services/surfaceflinger/DisplayDevice.h
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 20 Aug 2014 20:02:02 +0000 (20:02 +0000)
		1	2
services/surfaceflinger/DisplayDevice.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/DisplayDevice.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history