tree d382f32466adfd949c09d6c6d3de8a1ffe5d764e
parent 03691218ada2fb7e084ad4ae7ddd54f9b28d5611
parent e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c
author Colin Cross <ccross@android.com> 1390610694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390610694 +0000

am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"

* commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
  libGLES_android: fix 64-bit compile errors