tree 1452bbb0b24f84b1f759e46f1b0d1db737de8bf7
parent 9a104951a387a84709705405732a69f690d2c9f0
parent 364ed9545382539ab9875555947bc18ec94bb82b
author Jesse Hall <jessehall@google.com> 1431380544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431380544 +0000

am 364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"

* commit '364ed9545382539ab9875555947bc18ec94bb82b':
  libEGL: whitelist the EGL_KHR_create_context_no_error extension