| commit | cbbbb2ae268ea637a317abf1d3643365702da59e | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Jul 29 10:55:58 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 29 10:55:58 2011 -0700 |
| tree | b30ed39479eb819a41c368feaeb0f43216d7cd4f | |
| parent | 472f6d102cbc9bf5b21e6a945f4e18f8105ce838 [diff] | |
| parent | f9c0f5aa4fe8aedef5200b58eee483be4f24fcd4 [diff] |
am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE * commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8': Fix NPE when going from proxy to no proxy.