Commit 3b74bc0a authored by Andreas Sandblad's avatar Andreas Sandblad Committed by Android Git Automerger
Browse files

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

Merge commit '301b1df2'

* commit '301b1df2':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy
parents 18a021c6 301b1df2
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