tree b3df025659998e5c1f11bdfe369de2b5b9a59b31
parent 580c1c5903fd2bd462fa51703de887f56101d9ab
parent 097b59919f01d7b057d252d23cb96ce5fcdd9469
author Narayan Kamath <narayan@google.com> 1393334231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393334231 +0000

am 097b5991: am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes"

* commit '097b59919f01d7b057d252d23cb96ce5fcdd9469':
  Use long for pointers in opengl/EGL classes