am 4c37d088: am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine"

author Jesse Hall <jessehall@google.com>

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

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

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