tree 95a4fcb6fe7f7016d3a8c0621b6e2656ffbfb843
parent c73a475de5192d984f3ca104b717cc31742eb2e9
parent 117408f1b6bd6a70bb9d94276a68c6236fefe5cc
author David Turner <digit@android.com> 1308586276 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308586276 -0700

am 117408f1: am 407faf4c: am b9cbdec5: Merge "emulator opengl: implemented getProcAddress in GLESv1."

* commit '117408f1b6bd6a70bb9d94276a68c6236fefe5cc':
  emulator opengl: implemented getProcAddress in GLESv1.