Merge changes Id437e220,I9d6b3fba
authorTreehugger Robot <treehugger-gerrit@google.com>
Mon, 11 Sep 2017 19:30:30 +0000 (19:30 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 11 Sep 2017 19:30:30 +0000 (19:30 +0000)
* changes:
  Allow ES 3.2 contexts to run sRGB write control unsupported test.
  Require GL_EXT_sRGB_write_control for GL_FRAMEBUFFER_SRGB enable/disable


Trivial merge