Jack Palevich 85d3f59ca0 am 8d0e1472: am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2
Merge commit '8d0e14723312a9f8286ba95cc559ee000eab1b82'

* commit '8d0e14723312a9f8286ba95cc559ee000eab1b82':
  More GLSurfaceView cleanup.
2009-11-17 07:34:53 -08:00
..