am f3fa0712: am 93573e91: Merge "Treat composition frames with no layers as using...

author Jesse Hall <jessehall@google.com>

Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)

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

Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)
author Jesse Hall <jessehall@google.com>
Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)
diff --cc services/surfaceflinger/DisplayHardware/HWComposer.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 2 Oct 2013 16:57:03 +0000 (09:57 -0700)
		1	2
services/surfaceflinger/DisplayHardware/HWComposer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history