tree 6801343a8962a5df732a0ef2b8857c7c4d0d894c
parent db531d33d5fbac8e02d3b7b9568a64da393fe806
parent 7a8671bc57b163ae8950a1876a4707c33790904b
author Jean-Baptiste Queru <jbq@google.com> 1302568367 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302568367 -0700

am 7a8671bc: Merge from gingerbread

* commit '7a8671bc57b163ae8950a1876a4707c33790904b':
  Fix the maddr issue for proxy authentication.