am d687504e: (-s ours) am 31e4d66a: Merge "DO NOT MERGE" into gingerbread

Merge commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4'

* commit 'd687504e73b9d4a41b7ba28de864b4f3ab5c48e4':
  DO NOT MERGE
tree: 60e01d1b54244b5da6a07286d5794b6fb7346442
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE