tree 37390a9c79e12a7e50882105b88d03a642522b7b
parent daaabe8a8d47af6745f2d29d5eb84a6e3db16ca5
parent c76cd1afbcf26bf211f697ac6174988743a25eff
author David Turner <digit@android.com> 1308727137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308727137 -0700

am c76cd1af: am 49c24102: am 97dfbff4: Merge "emulator opengl: implement glGetString"

* commit 'c76cd1afbcf26bf211f697ac6174988743a25eff':
  emulator opengl: implement glGetString