am a15b5290: (-s ours) am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread

* commit 'a15b5290f5785031ec4813fd7e141a9fc39c18fa':
  revert the surface purgatory list and dependent changes.
tree: ebd08c379454e3064eb73207d60147d16406c2ad
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE