tree d4103f5acb97ae0f7a22dd74c5667e6fbe37db72
parent a788f09894f5b2113230a9ced9105fd6ad4c9a52
parent 3b7a1e6d70fda4ce834034930847fe2cc75de515
author Jack Palevich <jackpal@google.com> 1255482891 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255482891 -0700

am 3b7a1e6d: Merge change Ic52ba78c into eclair-mr2

Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp

* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
  Allow multiple OpenGL contexts on systems that support them.