tree 5fd40e981cbcfdb7b2917ae3215b4ad2d2b725ae
parent fec26c50974443f25715dd6dc64e81f1ea7b496c
parent a50a0e90fdd748218b738b9c13393d65248dd2cd
author Robert Greenwalt <rgreenwalt@google.com> 1311961996 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311961996 -0700

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

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