Merge "Apply fix for tessellation fractional even test verification."

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

Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)

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

Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)
diff --cc modules/gles31/functional/es31fTessellationTests.cpp
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 6 Mar 2015 20:00:42 +0000 (20:00 +0000)