tree 353e9eabc4acda69e11c4f92571bba4a71b51a72
parent e0b14ea70b58cd04696fb37ffcf733eefc2dd717
parent 97b3e43ff108cb4761450732fc02e4b69502b8a0
author Jesse Hall <jessehall@google.com> 1387066957 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387066957 +0000

am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"

* commit '97b3e43ff108cb4761450732fc02e4b69502b8a0':
  Fix incorrect name in eglSwapBuffers log wrapper