tree f6f2adc807835d1d4af1a218a7fe1039038f1b6e
parent 153c35f3354e7283c2e2f4071b7788eb33132af2
parent 351c4d55b7fbf3e1730878a845c5411fd724d7e0
author David Turner <digit@android.com> 1304452420 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304452420 -0700

am 351c4d55: Merge "emulator Opengl - slight type change for GLESv2"

* commit '351c4d55b7fbf3e1730878a845c5411fd724d7e0':
  emulator Opengl - slight type change for GLESv2