resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp
Steve Howard [Thu, 16 Sep 2010 20:58:30 +0000 (13:58 -0700)]
Change-Id: I18ede2f2d5ad8aa40cd61bdb7213659d356fdf57

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

@@@ -16,9 -16,6 +16,8 @@@
  
  package com.android.providers.downloads;
  
 +import org.apache.http.conn.params.ConnRouteParams;
 +
- import android.content.ContentUris;
  import android.content.ContentValues;
  import android.content.Context;
  import android.content.Intent;