am 2fc5da1c: am 521e5c62: Merge "Remove textureprojlodoffset.sampler3d_float_vertex...

author Pyry Haulos <phaulos@google.com>

Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +0000)

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

Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +0000)
author Pyry Haulos <phaulos@google.com>
Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +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	Pyry Haulos <phaulos@google.com>
	Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 21 Jul 2015 22:15:18 +0000 (22:15 +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