tree 33f2eceba2dc2463375e676b2f2d0568c1c3c74b
parent c856156c934342502e65b58676f5ce48d949afed
parent 146c41fa7ebde27ab9b25dc8182425e4996fa937
author Courtney Goeltzenleuchter <courtneygo@google.com> 1501702342 +0000
committer android-build-merger <android-build-merger@google.com> 1501702342 +0000

Merge "EGL: Add EGL_GL_scrgb extension" into oc-dr1-dev am: d5e8f47eff
am: 146c41fa7e  -s ours

Change-Id: I704f3cfe60bc4a3cbb6f437d47b5efec199646cb