am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2
am 73ae27f0: am 8da3ac92: resolved conflicts for merge of 3f857b78 to eclair-mr2

Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad'

* commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad':
  Allow a GLThread to release and reacquire the EGL Surface as needed.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base