tree 73bb67111a1bac0d35d1a31971d484840711bf03
parent b3a65bb0c2d2f6e660510efe0d93b3d26b0b2bf9
parent 618c78c032ce84c02724a1e5a7f439fa788ecf3a
author Jesse Hall <jessehall@google.com> 1401233492 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401233492 +0000

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

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