Merge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev am: e0000e9fa5
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Wed, 6 Sep 2017 22:11:14 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 22:11:14 +0000 (22:11 +0000)
am: ca76eb9ee8

Change-Id: If2bbf191f323dc932511f1cc05b28db12034aa84


Trivial merge