| commit | a128f5f8c952d7f519f64882792e832a4e75e2c8 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Jul 29 10:53:16 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 29 10:53:16 2011 -0700 |
| tree | fcd83ee6912b63fd156fb5e47a49eca804e4e205 | |
| parent | 86574d66dacc09c9b5a0a0ab2623ec01704b6fc8 [diff] | |
| parent | 1a230885b356256e91b3bf006ec72213ba6f8f76 [diff] |
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.