am 26931108: am 4f2b8b0a: Merge "Remove highp acosh() and atanh() tests from mustpass...

author Pyry Haulos <phaulos@google.com>

Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)

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

Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)
author Pyry Haulos <phaulos@google.com>
Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)
diff --cc android/cts/master/com.drawelements.deqp.gles3.xml
Simple merge
diff --cc android/cts/master/com.drawelements.deqp.gles31.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	Pyry Haulos <phaulos@google.com>
	Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 10 Jul 2015 21:56:03 +0000 (21:56 +0000)
		1	2
android/cts/master/com.drawelements.deqp.gles3.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/com.drawelements.deqp.gles31.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