Merge "Remove invalid atomic image compare swap tests from mustpass." into lmp-sprout-dev

author Mika Isojärvi <misojarvi@google.com>

Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +0000)
author Mika Isojärvi <misojarvi@google.com>
Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +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	Mika Isojärvi <misojarvi@google.com>
	Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Mar 2015 18:21:09 +0000 (18:21 +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