am 9555fa0c: am 7c532311: Remove from mustpass 3D texture_function cases with LOD...

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

Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)

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

Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)
diff --cc android/cts/master/com.drawelements.deqp.gles3.xml
Simple merge
diff --cc android/cts/master/gles3-master.txt
Simple merge
diff --cc android/cts/master/src/gles3-test-issues.txt
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 3 Jul 2015 16:48:27 +0000 (16:48 +0000)
		1	2
android/cts/master/com.drawelements.deqp.gles3.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/gles3-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/src/gles3-test-issues.txt	patch \|	diff1 \|	diff2 \|	blob \| history