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

Browse Source

* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.

...

This commit is contained in:

Robert Greenwalt 2011-07-29 10:55:58 -07:00 committed by Android Git Automerger

parent 472f6d102c f9c0f5aa4f

commit cbbbb2ae26

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available