am 8ac896b8: Merge "Fix serious data loss issue for folders and hotseat items" into ub-now-mister-ugly

* commit '8ac896b8c84066c109c2c4b97805f36270636121':
  Fix serious data loss issue for folders and hotseat items
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index fa3a752..ad43cba 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -804,7 +804,9 @@
                 // which no longer exist. Since this can cause other problems, and since the user
                 // will never see these items anyway, we use database upgrade as an opportunity to
                 // clean things up.
-                removeOrphanedItems(db);
+
+                // TODO: this needs to be fixed, currently causes data loss.
+                //removeOrphanedItems(db);
                 version = 18;
             }