tree d38abccb24030616bdaef1c2fd1a19f7b5d88467
parent fe8c4f7bbad87fc387b8d8b79f5343055a1a1039
parent b7a109c02735bb0d9e0bcb8f84e4aa3923701460
author David 'Digit' Turner <digit@google.com> 1289348758 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1289348758 -0800

am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread

* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
  Refresh EGL header to work with the NDK