commit cc3a37dbb5f49c7efa3c24513c00f76574455adf
author Adam Cohen <adamcohen@google.com> Sat Feb 13 12:53:30 2016 -0800
committer Adam Cohen <adamcohen@google.com> Sat Feb 13 12:53:48 2016 -0800
tree d5dec47b1c0d7eb5e124837a8c5f5229bb9302b0
parent f9c184a619e4e4b82cf9e0bf318ca6d8deaaaee7

Fix build; broken import due to bad merge

Change-Id: I751962d59a75002c2c6b142387d9a69982c8b73b

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 4df7edd..63c03e5 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.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;