tree 0c6a5df58e80358e08daa1714cd36825b6422fba
parent 99ce45732030d379549f74248f1f5cc88dfbf191
parent 793b2293797ea930078640c4827d3cbdf449c227
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