Merge "Add query tests for AEP states."

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

Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)

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

Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)
author Jarkko Pöyry <jpoyry@google.com>
Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)
diff --cc modules/glshared/glsStateQueryUtil.cpp
Simple merge
author	Jarkko Pöyry <jpoyry@google.com>
	Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 13 Feb 2015 23:11:27 +0000 (23:11 +0000)