tree 12a9459213cb2a0c0b623f8ad42408ad2af656c5
parent 00666295a03f36d908c9d2aa57cc08bc0c57226a
parent 0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02
author Jack Palevich <jackpal@google.com> 1260403125 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260403125 -0800

am 0dce2dd2: Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context

Merge commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02' into eclair-mr2-plus-aosp

* commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02':
  Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context