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.
This commit is contained in:
Robert Greenwalt 2011-07-29 10:53:16 -07:00 committed by Android Git Automerger
commit f9c0f5aa4f

Diff Content Not Available