resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polish

Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a

src/com/android/launcher3/Workspace.java

@@ -1326,7 +1326,7 @@ public class Workspace extends PagedView
                         mLauncher.overrideWallpaperDimensions());
                 return null;
             }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+        }.executeOnExecutor(Utilities.THREAD_POOL_EXECUTOR);
     }
 
     protected void snapToPage(int whichPage, Runnable r) {