tree 0089bce5a15860c91ab373e70773f714d177831d
parent f0035c0e7077bc2d7a8aaf6516d96b0d2b1ba22d
parent e7c14c45c80070fee70451deb8a0a53de66e5a43
author Jesse Wilson <jessewilson@google.com> 1291677832 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291677832 -0800

Merge "Use proxies specified by system properties in DefaultHttpClient."