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)
commitca76eb9ee8739d0d0e647bfbb4eb41fe2001d787
tree6df1ef76e5c9137ed3193b483a3c5bf3ec393470
parent7348cba61ad0558a40c6e63d32caad07041d1a2b
parente0000e9fa5844a86050ae972c6abf4df53abeb37
Merge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev
am: e0000e9fa5

Change-Id: I4dda3ae340a7019ab7e4dde0fa49bfc34c06ca41