tree 42baa14004eb90cdd6cc054fbf0a54c29e5e0f9d
parent adcf12ed0864d17937a358b18a609a611cfa8bf5
parent ea3858285b2876d241218f9319cc256972160c1c
author Jesse Hall <jessehall@google.com> 1402072364 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402072364 +0000

am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"

* commit 'ea3858285b2876d241218f9319cc256972160c1c':
  ndk: Remove extra GLES symbols on 64-bit platforms