tree f4d901d22f470e7d421cde73033da6a191f7db17
parent 25e77b334ff8903cf6cd28ece9ba38a066062540
parent 770a2991ab6b7501224a332b2608ea342ada6068
author Dirk Dougherty <ddougherty@google.com> 1264207797 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264207797 -0800

am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair

Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp

* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.