tree 99107cf4cf0b6ce32b4a41e19d8f6c491b170527
parent 281c975dbf77243ebdd5bf5fab17dee5c6f297e5
parent c05246ae344f16f3892a1274ef75627772c7c9aa
author Mathias Agopian <mathias@google.com> 1284686779 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284686779 -0700

am 793b2293: am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread

Merge commit '793b2293797ea930078640c4827d3cbdf449c227'

* commit '793b2293797ea930078640c4827d3cbdf449c227':
  surfaceflinger / GL extensions cleanup