tree 07bf6a82c52f6ba59f8c24db28b6171a2d6a81a6
parent 953b299d36f1fe019908affa02271594bd17887f
parent bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38
author Mathias Agopian <mathias@google.com> 1321410330 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321410330 -0800

am bc1b7f04: am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1

* commit 'bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38':
  rework a bit how we manage EGL extensions