tree ec53243112377c82cfc5f0e217b2b71ba5aed044
parent e28cee4db88a75aa7627caef0658ca95a13dff8d
parent 50e2a8157c9a44d2ac4c8e25d5212b12eba21a85
author David Turner <digit@android.com> 1309963515 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963515 -0700

am 50e2a815: am 76e58151: Merge "opengl translator: EGL Windows bug fix"

* commit '50e2a8157c9a44d2ac4c8e25d5212b12eba21a85':
  opengl translator: EGL Windows bug fix