commit f27cb0e6b1edb2a53de64fdd12d25f400a3acdd9
author Sunny Goyal <sunnygoyal@google.com> Wed Sep 23 16:12:02 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Sep 23 16:12:02 2015 -0700
tree 846cc10d71a2452f4ba7acdc242c1bc3366c6a7c
parent 5a7a1ce0a7affdff02029793ac24b2581075acee
parent 8ac727b2c6627028960a1efe18ab9c72442eef48

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

Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 35de223..e320d4e 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2475,7 +2475,7 @@
                     appWidgetHost.deleteAppWidgetId(widgetInfo.appWidgetId);
                     return null;
                 }
-            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            }.executeOnExecutor(Utilities.THREAD_POOL_EXECUTOR);
         }
         removeWidgetToAutoAdvance(widgetInfo.hostView);
         widgetInfo.hostView = null;
@@ -4828,7 +4828,7 @@
                     }
                     return null;
                 }
-            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+            }.executeOnExecutor(Utilities.THREAD_POOL_EXECUTOR);
         }
     }
 }