commit | f9665221aaa229dc8a7cac6fbd1d9ea165c42068 | [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 | b3a4d430182803915b92b20d082bb92f0980e64d | |
parent | bd176f36ca9ab357cfa6fa330c4955b1a0ef8d35 [diff] | |
parent | a128f5f8c952d7f519f64882792e832a4e75e2c8 [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.