Merge "Do not query non-existent texture level in TEXTURE_FIXED_SAMPLE_LOCATIONS...

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

Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)

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

Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)
diff --cc modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 3 Mar 2015 21:24:09 +0000 (21:24 +0000)