am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE)

* commit 'c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
tree: 83782c70e05463d7dde8924ea545e9c503398211
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE