From cc3a37dbb5f49c7efa3c24513c00f76574455adf Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sat, 13 Feb 2016 12:53:30 -0800
Subject: [PATCH] Fix build; broken import due to bad merge

Change-Id: I751962d59a75002c2c6b142387d9a69982c8b73b
---
 src/com/android/launcher3/allapps/AllAppsContainerView.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 4df7edd56c..63c03e564c 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -40,14 +40,13 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DragSource;
 import com.android.launcher3.DropTarget;
 import com.android.launcher3.ExtendedEditText;
-import com.android.launcher3.Folder;
-import com.android.launcher3.folder.Folder;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherTransitionable;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.folder.Folder;
 import com.android.launcher3.util.ComponentKey;
 
 import java.nio.charset.Charset;