am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread

* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
  Merge 1911a6f7 into gingerbread. do not merge.
tree: 1c6db7a9e7e55e8c51db4bd409c033b5adc03a55
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE