merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:03:15 -08:00
parent 89282e98fe 05ffc255c0
commit abc5772504
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/content/AbstractSyncableContentProvider.java
+++ b/core/java/android/content/AbstractSyncableContentProvider.java
@@ -690,6 +690,7 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
            while (c.moveToNext()) {
                String accountName = c.getString(0);
                String accountType = c.getString(1);
+		if ("localhost".equals(accountType)) continue;
                if (TextUtils.isEmpty(accountName)) {
                    continue;
                }