merge from open-source master
The Android Open Source Project [Mon, 19 Jul 2010 16:26:48 +0000 (09:26 -0700)]
Change-Id: I706a8164dbb3f499736e6dcef0e8b65f3c309c44

1  2 
src/com/android/providers/downloads/DownloadThread.java

  
  package com.android.providers.downloads;
  
 -import org.apache.http.Header;
 -import org.apache.http.HttpResponse;
 -import org.apache.http.client.methods.HttpGet;
 -import org.apache.http.client.HttpClient;
+ import org.apache.http.conn.params.ConnRouteParams;
 -import org.apache.http.entity.StringEntity;
  import android.content.ContentUris;
  import android.content.ContentValues;
  import android.content.Context;