Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

author Jesse Hall <jessehall@google.com>

Tue, 2 Dec 2014 00:34:50 +0000 (00:34 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 2 Dec 2014 00:34:51 +0000 (00:34 +0000)
author Jesse Hall <jessehall@google.com>
Tue, 2 Dec 2014 00:34:50 +0000 (00:34 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Dec 2014 00:34:51 +0000 (00:34 +0000)
diff --cc opengl/tools/glgen/stubs/egl/EGLExtcHeader.cpp
Simple merge
author	Jesse Hall <jessehall@google.com>
	Tue, 2 Dec 2014 00:34:50 +0000 (00:34 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 2 Dec 2014 00:34:51 +0000 (00:34 +0000)