Jack Palevich a9e47546a5 am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
Merge commit '79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp

* commit '79447b2087c8c820d742185dda7305101f9656f0':
  Improve GLSurfaceView to avoid deadlocks and race conditions.
2009-11-06 00:25:44 -08:00
..