tree c2236669304292e3b89c58b014b668750b153676
parent 81e21789a87f530cec499694186885cbe059b7db
parent 321714abd24dfcd5e222b2b7c21780f558d9e5c9
author David Turner <digit@android.com> 1312904137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312904137 -0700

am 321714ab: Merge "opengles emulator: fix eglGetError"

* commit '321714abd24dfcd5e222b2b7c21780f558d9e5c9':
  opengles emulator: fix eglGetError