tree 677beee017f4dec2418cbda4642e6dc9fe1faea8
parent 9ce81e383a7d16be39f0598c077d57b2373fd510
parent 8bd39ae17caac6d275d785ce9420d7e643f15eb9
author Jesse Hall <jessehall@google.com> 1330114118 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330114118 -0800

am 8bd39ae1: Merge "EmuGL: GLESv2 support for OES_EGL_image_external" into ics-mr1

* commit '8bd39ae17caac6d275d785ce9420d7e643f15eb9':
  EmuGL: GLESv2 support for OES_EGL_image_external