commit b4ee57927224429e34e3a81519b2ea658e41fc45
author Dan Sandler <dsandler@android.com> Tue Dec 03 16:44:52 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 03 16:44:52 2013 -0800
tree aa8511319a08677679b7967e7bb925f460f085e3
parent 87f445c8b28c59e787e5fbfc7ba223e112d2263f
parent b3084e87fcf7b617899b3c858d5372d079e0fe36

am b3084e87: Merge "Revert "Revert "Enable Launcher2 workspace import.""" into jb-ub-now-jolly-elf

* commit 'b3084e87fcf7b617899b3c858d5372d079e0fe36':
  Revert "Revert "Enable Launcher2 workspace import.""

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 54de635..27b7dae 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -72,7 +72,7 @@
     static final String AUTHORITY = ProviderConfig.AUTHORITY;
 
     // Should we attempt to load anything from the com.android.launcher2 provider?
-    static final boolean IMPORT_LAUNCHER2_DATABASE = false;
+    static final boolean IMPORT_LAUNCHER2_DATABASE = true;
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";