tree e9ca505439a9525b14e5da9918a5aa78e24dcbd7
parent 9a25b94430905d512add055deac34bfa103bbd4e
parent 2525acf5a9855d748c008268bb26d6f6d5045d84
author Narayan Kamath <narayan@google.com> 1394561780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394561780 +0000

am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY