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.