am b6ea7073: am 84e26791: (-s ours) Merge "DO NOT MERGE: Remove io_blocks.match_diffe...

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

Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)

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

Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
diff --cc android/cts/com.drawelements.deqp.gles31.xml
Simple merge
diff --cc android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
		1	2
android/cts/com.drawelements.deqp.gles31.xml	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/es31-mustpass-2014.2.9-2014-10-24.txt	patch \|	diff1 \|	diff2 \|	blob \| history