tree e42204f19b683c41a2535d22228eea544c55b04f
parent 53dfd83d48777e0196117322a498cea8cc29f863
parent 9e883e8b5fa510593ba43cbf3f77db39c34db015
author David Turner <digit@android.com> 1312904168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312904168 -0700

am 9e883e8b: Merge "opengles emulator: fix eglGetProcAddress"

* commit '9e883e8b5fa510593ba43cbf3f77db39c34db015':
  opengles emulator: fix eglGetProcAddress