tree 7d7f3eed7934a0a076a3fe57760b6cdd79ef4fdc
parent 839e06ad4a8aae953e12b5949c9d103fecf44c9f
parent 4391d215e13da52f287ff8d70fa52c52c84c9772
author David Turner <digit@android.com> 1308840480 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308840480 -0700

am 4391d215: am c0f900b7: am 5f326344: am 025c1f7f: Merge "emulator opengl: Fix bug when re-binding the same context"

* commit '4391d215e13da52f287ff8d70fa52c52c84c9772':
  emulator opengl: Fix bug when re-binding the same context