am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
tree: bbf83ec5be558d536e86597a4eb2e0e0741a3a62
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE