Commit 301b1df2 authored by Andreas Sandblad's avatar Andreas Sandblad Committed by Android Git Automerger
Browse files

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

Merge commit '9340bb2a' into gingerbread-plus-aosp

* commit '9340bb2a':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy
parents 3cb0a125 9340bb2a
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