am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and...

author Jesse Hall <jessehall@google.com>

Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)

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

Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
author Jesse Hall <jessehall@google.com>
Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
diff --cc services/surfaceflinger/DisplayHardware/HWComposer.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)
		1	2
services/surfaceflinger/DisplayHardware/HWComposer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history