tree 278e8d6772523771c0ebac5596c97546e812140a
parent 4000df931bb1b0f9a9e37430212124a9c37e6972
parent 3d1f08375865a75ab6f67a45967cf9ad0c19ef72
author Jesse Hall <jessehall@google.com> 1402071417 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402071417 +0000

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

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