tree d6f0ffcf7d074ec8d86131bde978c0c76ed6ac64
parent 18a021c6d6e877e28ac55ffe2d06b7563605c7a0
parent 301b1df2f0b25ef56a640840742c981623faf20f
author Andreas Sandblad <andreas.sandblad@sonyericsson.com> 1280505637 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280505637 -0700

am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxy

Merge commit '301b1df2f0b25ef56a640840742c981623faf20f'

* commit '301b1df2f0b25ef56a640840742c981623faf20f':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy