tree 11d67241d53ce71bba2b30055e4e79e812ce7122
parent 790c4294da25a9d935ed9a520f9ca3d20a48790f
parent e54f267f06e86f9c1248742fc56967355721a4e7
author Jack Palevich <jackpal@google.com> 1257555392 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257555392 -0800

am e54f267f: am a3a351e5: resolved conflicts for merge of 4e3fadd0 to eclair-mr2

Merge commit 'e54f267f06e86f9c1248742fc56967355721a4e7'

* commit 'e54f267f06e86f9c1248742fc56967355721a4e7':
  Fix stupid bug in GLThreadManager implementation.