tree 98c348c0c35ef7ce4442b50dd65b48e610c1ea72
parent 80a4e2497c3b5ef24fe1408c678053fbc6cd4b25
parent b2520c7f1348cfcb3fa9c2e039140c1addb7688a
author Jean-Baptiste Queru <jbq@google.com> 1273188698 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273188698 -0700

am b2520c7f: manual merge from froyo

Merge commit 'b2520c7f1348cfcb3fa9c2e039140c1addb7688a' into kraken

* commit 'b2520c7f1348cfcb3fa9c2e039140c1addb7688a':
  DO NOT MERGE: Rewrite the HTTP connection pool used by HttpURLConnection.