diff --git a/mobile/android/base/AndroidImport.java b/mobile/android/base/AndroidImport.java
new file mode 100644
index 000000000000..a4218c7d0978
--- /dev/null
+++ b/mobile/android/base/AndroidImport.java
@@ -0,0 +1,142 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.db.BrowserContract.Bookmarks;
+import org.mozilla.gecko.db.LocalBrowserDB;
+import org.mozilla.gecko.R;
+
+import android.app.ProgressDialog;
+import android.content.ContentResolver;
+import android.content.ContentProviderResult;
+import android.content.ContentProviderOperation;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteConstraintException;
+import android.net.Uri;
+import android.os.Build;
+import android.os.RemoteException;
+import android.preference.Preference;
+import android.provider.Browser;
+import android.provider.Browser.BookmarkColumns;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+class AndroidImport implements Runnable {
+    static final private String LOGTAG = "AndroidImport";
+    private Context mContext;
+    private Runnable mOnDoneRunnable;
+    private ArrayList<ContentProviderOperation> mOperations;
+    private ContentResolver mCr;
+    private LocalBrowserDB mDB;
+
+    public AndroidImport(Context context, Runnable onDoneRunnable) {
+        mContext = context;
+        mOnDoneRunnable = onDoneRunnable;
+        mOperations = new ArrayList<ContentProviderOperation>();
+        mCr = mContext.getContentResolver();
+        mDB = new LocalBrowserDB(GeckoProfile.get(context).getName());
+    }
+
+    public void mergeBookmarks() {
+        Cursor cursor = mCr.query(Browser.BOOKMARKS_URI,
+                                  null,
+                                  Browser.BookmarkColumns.BOOKMARK + " = 1",
+                                  null,
+                                  null);
+
+        final int faviconCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.FAVICON);
+        final int titleCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.TITLE);
+        final int urlCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.URL);
+        // http://code.google.com/p/android/issues/detail?id=17969
+        final int createCol = cursor.getColumnIndex(Browser.BookmarkColumns.CREATED);
+
+        cursor.moveToFirst();
+        while (!cursor.isAfterLast()) {
+            String url = cursor.getString(urlCol);
+            String title = cursor.getString(titleCol);
+            long created;
+            if (createCol >= 0) {
+                created = cursor.getLong(createCol);
+            } else {
+                created = System.currentTimeMillis();
+            }
+            // Need to set it to the current time so Sync picks it up.
+            long modified = System.currentTimeMillis();
+            byte[] data = cursor.getBlob(faviconCol);
+            mDB.updateBookmarkInBatch(mCr, mOperations,
+                                      url, title, null, -1,
+                                      created, modified,
+                                      BrowserContract.Bookmarks.DEFAULT_POSITION,
+                                      null, Bookmarks.TYPE_BOOKMARK);
+            if (data != null) {
+                mDB.updateFaviconInBatch(mCr, mOperations, url, null, null, data);
+            }
+            cursor.moveToNext();
+        }
+        cursor.close();
+
+        flushBatchOperations();
+    }
+
+    public void mergeHistory() {
+        Cursor cursor = mCr.query(Browser.BOOKMARKS_URI,
+                                  null,
+                                  Browser.BookmarkColumns.BOOKMARK + " = 0 AND " +
+                                  Browser.BookmarkColumns.VISITS + " > 0",
+                                  null,
+                                  null);
+
+        final int dateCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.DATE);
+        final int faviconCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.FAVICON);
+        final int titleCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.TITLE);
+        final int urlCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.URL);
+        final int visitsCol = cursor.getColumnIndexOrThrow(Browser.BookmarkColumns.VISITS);
+
+        cursor.moveToFirst();
+        while (!cursor.isAfterLast()) {
+            String url = cursor.getString(urlCol);
+            String title = cursor.getString(titleCol);
+            long date = cursor.getLong(dateCol);
+            int visits = cursor.getInt(visitsCol);
+            byte[] data = cursor.getBlob(faviconCol);
+            mDB.updateHistoryInBatch(mCr, mOperations, url, title, date, visits);
+            if (data != null) {
+                mDB.updateFaviconInBatch(mCr, mOperations, url, null, null, data);
+            }
+            cursor.moveToNext();
+        }
+        cursor.close();
+
+        flushBatchOperations();
+    }
+
+    protected void flushBatchOperations() {
+        Log.d(LOGTAG, "Flushing " + mOperations.size() + " DB operations");
+        try {
+            // We don't really care for the results, this is best-effort.
+            mCr.applyBatch(BrowserContract.AUTHORITY, mOperations);
+        } catch (RemoteException e) {
+            Log.e(LOGTAG, "Remote exception while updating db: ", e);
+        } catch (OperationApplicationException e) {
+            // Bug 716729 means this happens even in normal circumstances
+            Log.d(LOGTAG, "Error while applying database updates: ", e);
+        }
+        mOperations.clear();
+    }
+
+    @Override
+    public void run() {
+        mergeBookmarks();
+        mergeHistory();
+
+        mOnDoneRunnable.run();
+    }
+}