tree e0df94bc2ff326eebd918d393169c24ed4da4abd
parent 1bc1761d36b75c7df41a56de486c94953ea2f3b5
parent 17cbadf0f598b0d02179262ad5b6b270850ccb94
author Jesse Hall <jessehall@google.com> 1402100393 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402100393 +0000

am 17cbadf0: am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"

* commit '17cbadf0f598b0d02179262ad5b6b270850ccb94':
  Add aarch64 EGL/GLES trampolines