diff options
| author | Steve Howard <showard@google.com> | 2010-09-28 17:11:47 -0700 |
|---|---|---|
| committer | Steve Howard <showard@google.com> | 2010-09-28 17:11:47 -0700 |
| commit | 36fe2ebd81ae3fa7ad07caa629a4f7603fec1634 (patch) | |
| tree | f62d71462b2a4bc9eafba54a7f77174935118775 /src | |
| parent | 97779579a8512fcd34cd6528ca0918aa0756056b (diff) | |
| parent | 52b4e95647d06bc2b4e8a2b8e5caec88280514bb (diff) | |
| download | packages_apps_Browser-36fe2ebd81ae3fa7ad07caa629a4f7603fec1634.zip packages_apps_Browser-36fe2ebd81ae3fa7ad07caa629a4f7603fec1634.tar.gz packages_apps_Browser-36fe2ebd81ae3fa7ad07caa629a4f7603fec1634.tar.bz2 | |
resolved conflicts for merge of 52b4e956 to master
Change-Id: I1f7c15b71d52161309dfb6b453ec9b8e5f5df161
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/OpenDownloadReceiver.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 0690e68..4ea96bb 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -25,6 +25,7 @@ import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; +import android.app.DownloadManager; import android.app.ProgressDialog; import android.app.SearchManager; import android.content.ActivityNotFoundException; @@ -52,7 +53,6 @@ import android.graphics.Picture; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; -import android.net.DownloadManager; import android.net.NetworkInfo; import android.net.Uri; import android.net.WebAddress; diff --git a/src/com/android/browser/OpenDownloadReceiver.java b/src/com/android/browser/OpenDownloadReceiver.java index 26bf51e..99e5f41 100644 --- a/src/com/android/browser/OpenDownloadReceiver.java +++ b/src/com/android/browser/OpenDownloadReceiver.java @@ -16,13 +16,13 @@ package com.android.browser; +import android.app.DownloadManager; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.net.DownloadManager; import android.net.Uri; import android.provider.Downloads; import android.widget.Toast; |