tree e8978854d972017eca41f5a2232511d69728eb7c
parent 860bba68a1d65534ce6aec6ba8c0b0a736b18ccc
parent 3aeb629d8251699237e3d067be4fb44ba206626c
author Narayan Kamath <narayan@google.com> 1392136228 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392136228 -0800

am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"

* commit '3aeb629d8251699237e3d067be4fb44ba206626c':
  Use long to store pointers in GLES_JNI/EGL classes