Merge changes Ic91c8106,Ieaf5422b
authorJarkko Pöyry <jpoyry@google.com>
Fri, 20 Mar 2015 18:02:57 +0000 (18:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Mar 2015 18:02:57 +0000 (18:02 +0000)
* changes:
  Support GL_EXT_texture_sRGB_R(G)8 extensions in fbo completeness tests.
  Support GL_EXT_texture_sRGB_R(G)8 extension in glw.


Trivial merge