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

Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a
This commit is contained in:
Sunny Goyal
2015-09-23 16:12:02 -07:00
5 changed files with 21 additions and 19 deletions

View File

@@ -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) {