Merge "Only import bookmarks not associated with an account"
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 1c82e1c..9c763e9 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -426,7 +426,8 @@
// Re-parent the existing bookmarks to the newly create bookmarks bar folder
ops.add(ContentProviderOperation.newUpdate(Bookmarks.CONTENT_URI)
.withValueBackReference(Bookmarks.PARENT, 2)
- .withSelection(Bookmarks.PARENT + "=?",
+ .withSelection(Bookmarks.ACCOUNT_NAME + " IS NULL AND " +
+ Bookmarks.PARENT + "=?",
new String[] { Integer.toString(1) })
.build());