Commit b628cc4c authored by Jesse Wilson's avatar Jesse Wilson Committed by Android Git Automerger
Browse files

am 7fe9c8ad: Merge "Tests for HTTP bugs using HTTPS through a proxy." into gingerbread 

Merge commit '7fe9c8ad62d8fcedf14ed44761de32a5a7ad569b' into gingerbread-plus-aosp

* commit '7fe9c8ad62d8fcedf14ed44761de32a5a7ad569b':
  Tests for HTTP bugs using HTTPS through a proxy.
parents a4ef2da4 e61aa2e8
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