resolve merge conflicts of b81edb4 to master

author David Sodman <dsodman@google.com>

Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)

committer David Sodman <dsodman@google.com>

Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)
author David Sodman <dsodman@google.com>
Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)
committer David Sodman <dsodman@google.com>
Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)
diff --cc android/cts/master/gles31-master.txt
Simple merge
diff --cc android/cts/master/src/gles31-test-issues.txt
Simple merge
author	David Sodman <dsodman@google.com>
	Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)
committer	David Sodman <dsodman@google.com>
	Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)
		1	2
android/cts/master/gles31-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/src/gles31-test-issues.txt	patch \|	diff1 \|	diff2 \|	blob \| history