am 706acd37: am 0fd10bc9: Merge "Remove texture size tests with incorrect threshold...

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

Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +0000)

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

Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +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>
	Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 29 Jun 2015 23:50:48 +0000 (23:50 +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