tree 0041ea25dec5cf9c6913f70395575f96f2376dd7
parent 2f5a887ebf69ba3cd3c8b7d6654576a07089ed9c
parent 9076fa78d2541fa14253aaf08e6445fafa17e35b
author Narayan Kamath <narayan@google.com> 1394243474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394243474 +0000

am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base"

* commit '9076fa78d2541fa14253aaf08e6445fafa17e35b':
  Update EGL codegen to be in sync with frameworks/base