tree 0e0c84d611d4146d9a33cff9a4e771dbe3dbce4d
parent cfba3bf1606dfdb1daf1be1c19176180660ae19d
parent dc2736219fa897840d1ff12b11cd7defb636f845
author Jesse Hall <jessehall@google.com> 1401233360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401233360 +0000

am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"

* commit 'dc2736219fa897840d1ff12b11cd7defb636f845':
  EGL: add x86/64 assembly code for EGL/GLES wrappers