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

Change-Id: I4dda3ae340a7019ab7e4dde0fa49bfc34c06ca41


Trivial merge