commit 5ad0d55d4a24a92d51fa6675150b62ccf468789c
author Bjorn Bringert <bringert@android.com> Sat Dec 05 10:25:55 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Dec 05 10:25:55 2009 -0800
tree 1d1946088b4a4366ae665e8456735e1b9518b602
parent e05eb5c9777a2a93509a74556a12327c2c0ab889
parent 80a56269482dcc071e1b413baf968509bd9da9fb

am 80a56269: Merge change Ie2888363 into eclair-mr2

Merge commit '80a56269482dcc071e1b413baf968509bd9da9fb' into eclair-mr2-plus-aosp

* commit '80a56269482dcc071e1b413baf968509bd9da9fb':
  Change SearchableInfo import

src/com/android/browser/BrowserProvider.java

diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index 618afc1..6755268 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -17,6 +17,7 @@
 package com.android.browser;
 
 import android.app.SearchManager;
+import android.app.SearchableInfo;
 import android.backup.BackupManager;
 import android.content.ComponentName;
 import android.content.ContentProvider;
@@ -42,7 +43,6 @@
 import android.provider.Browser;
 import android.provider.Settings;
 import android.provider.Browser.BookmarkColumns;
-import android.server.search.SearchableInfo;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;