Merge changes I688d84e5,Icce01201
authorJarkko Pöyry <jpoyry@google.com>
Fri, 13 Feb 2015 20:38:29 +0000 (20:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Feb 2015 20:38:30 +0000 (20:38 +0000)
commit2fed6fb653077fbf7ad22260f0457bf6d2cd45d3
tree48a0ba83def097b795765db97c94002db4f90f53
parentd29f038804c0a905171dbc1fc01f85b1092c6b40
parentab44fc6da25bb126919615ad2ded101695251161
Merge changes I688d84e5,Icce01201

* changes:
  Move tcu::ResultCollector to a separate file.
  Add query tests for ES31 states.
Android.mk
modules/gles31/functional/CMakeLists.txt
modules/gles31/functional/es31fFunctionalTests.cpp