tree 41589c169a8bfe3f0e3fd45841c71f3efa8fa079
parent 8635056f5f5a0beb12539b9ee6256b5c0ae868cb
parent 47de335bd60310be3cb2f936a5547dc060918e99
author David Turner <digit@android.com> 1309963561 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963561 -0700

am 47de335b: am b5196422: Merge "opengles emulator: Init eglError to EGL_SUCCESS"

* commit '47de335bd60310be3cb2f936a5547dc060918e99':
  opengles emulator: Init eglError to EGL_SUCCESS