Jack Palevich 3f7b5a13ca am a9e47546: am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
Merge commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323'

* commit 'a9e47546a5132b30a2ed1e24d9193d4db09ef323':
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 00:40:00 -08:00
..