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

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

* commit '9340bb2a4b5f828b418c0e77492dde148623c938':
  Fixed problem using HTTPS with Apache HTTP Client when using proxy
tree: 4d05155531e7849126cb313504b8a9dc20bdc503
  1. src/
  2. CleanSpec.mk
  3. MODULE_LICENSE_APACHE2
  4. NOTICE
  5. ThirdPartyProject.prop