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

* commit 'b4ee57927224429e34e3a81519b2ea658e41fc45':
  Revert "Revert "Enable Launcher2 workspace import.""
This commit is contained in:
Dan Sandler
2014-02-14 20:38:24 +00:00
committed by Android Git Automerger
@@ -72,7 +72,7 @@ public class LauncherProvider extends ContentProvider {
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";