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

Merge commit '3b74bc0ac45043a6b559d44aa913de5803793a56' into dalvik-dev

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