Merge "Do not use color EGLimages as depth or stencil images or vice versa." into...

author Jarkko Pöyry <jpoyry@google.com>

Wed, 6 May 2015 20:30:03 +0000 (20:30 +0000)

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

Wed, 6 May 2015 20:31:15 +0000 (20:31 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Wed, 6 May 2015 20:30:03 +0000 (20:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 6 May 2015 20:31:15 +0000 (20:31 +0000)
diff --cc android/cts/master/com.drawelements.deqp.egl.xml
Simple merge
diff --cc android/cts/master/egl-master.txt
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Wed, 6 May 2015 20:30:03 +0000 (20:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 6 May 2015 20:31:15 +0000 (20:31 +0000)
		1	2
android/cts/master/com.drawelements.deqp.egl.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/egl-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history