tree d97c45e0161b1510b5849ea2c5ecaaa2ac4f106b
parent e3ca49a9495e5cd36b5cd3bcd163e11758a4e4cf
parent eae0aff8d44e339d8f79b6cadec985e8f9c349e2
author David Turner <digit@android.com> 1307376478 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307376478 -0700

am eae0aff8: am 87043c4e: Merge "opengl translator: added EGL_RENDERABLE_TYPE attrib"

* commit 'eae0aff8d44e339d8f79b6cadec985e8f9c349e2':
  opengl translator: added EGL_RENDERABLE_TYPE attrib