tree 0089bce5a15860c91ab373e70773f714d177831d
parent c9a8b4e3604e8512bd028025f1a849a8b21fe951
parent 3dafdc28e38c2720a85d8581b068e09e709ac434
author Jesse Wilson <jessewilson@google.com> 1291677973 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291677973 -0800

am 3dafdc28: Merge "Use proxies specified by system properties in DefaultHttpClient."

* commit '3dafdc28e38c2720a85d8581b068e09e709ac434':
  Use proxies specified by system properties in DefaultHttpClient.