Merge "Remove EGLImage tests affected by rounding issues from mustpass" into nyc...

author Mika Isojärvi <misojarvi@google.com>

Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +0000)
author Mika Isojärvi <misojarvi@google.com>
Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +0000)
diff --cc android/cts/master/com.drawelements.deqp.egl.xml
Simple merge
diff --cc android/cts/master/egl-master.txt
Simple merge
author	Mika Isojärvi <misojarvi@google.com>
	Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 28 Apr 2016 19:29:12 +0000 (19:29 +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