Merge "Add GLES3.1 uniform block syntax tests."

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

Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)

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

Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)
author Mika Isojärvi <misojarvi@google.com>
Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)
diff --cc android/cts/master/com.drawelements.deqp.gles31.xml
Simple merge
author	Mika Isojärvi <misojarvi@google.com>
	Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 17 Apr 2015 00:42:26 +0000 (00:42 +0000)