Jack Palevich 8d0e147233 am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2
Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp

* commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5':
  More GLSurfaceView cleanup.
2009-11-16 19:52:12 -08:00
..