tree 7b75c46004b807f9a00d6bd39a35f03add671a49
parent a0e668a50c1146a302cfdfad2d345c40ece31705
parent 3b74bc0ac45043a6b559d44aa913de5803793a56
author Andreas Sandblad <andreas.sandblad@sonyericsson.com> 1280505962 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280505962 -0700

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

Merge commit '3b74bc0ac45043a6b559d44aa913de5803793a56' into dalvik-dev

* commit '3b74bc0ac45043a6b559d44aa913de5803793a56':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy