Merge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 6 Sep 2017 20:36:37 +0000 (20:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Sep 2017 20:36:37 +0000 (20:36 +0000)

Trivial merge