am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
  Remove discoverable timeout handler. DO NOT MERGE
tree: b73c9c65f0df4ca1d56376e414f032d4c35d4309
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE