tree e4c724b4bcefe27d18c36e9d52da6c5c000031b3
parent 6b588edf747e8ccf3e3ca091e227d1cc33baac9b
parent cd7a4fd9375d86907463c847b4ccf9020f4f44cc
author David Turner <digit@android.com> 1304364794 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304364794 -0700

am cd7a4fd9: Merge "supporting EGL_KHR_image_base & EGL_KHR_gl_texture_2d_image extentions"

* commit 'cd7a4fd9375d86907463c847b4ccf9020f4f44cc':
  supporting EGL_KHR_image_base & EGL_KHR_gl_texture_2d_image extentions