Commit 0c8300bc authored by Andreas Sandblad's avatar Andreas Sandblad Committed by Android Git Automerger
Browse files

am 3b74bc0a: am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache... 

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

Merge commit '3b74bc0a' into dalvik-dev

* commit '3b74bc0a':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy
parents a0e668a5 3b74bc0a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment