Merge "Revert "EGL: Ensure surfaces are disconnected when destroyed"" into nyc-dev

author Pablo Ceballos <pceballos@google.com>

Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)

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

Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)
author Pablo Ceballos <pceballos@google.com>
Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)
diff --cc opengl/libs/EGL/eglApi.cpp
Simple merge
diff --cc opengl/libs/EGL/egl_display.cpp
Simple merge
author	Pablo Ceballos <pceballos@google.com>
	Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)
		1	2
opengl/libs/EGL/eglApi.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
opengl/libs/EGL/egl_display.cpp	patch \|	diff1 \|	diff2 \|	blob \| history