commit cfbc09aaee399fdf3441930de542853019a6e013
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 31 19:41:18 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 19:41:18 2017 +0000
tree fa2201103038df5bca59cec32e3bfb0d2ba40df4
parent 67a25e6ff1d7a3cdfbd73a46b792b3eb7abb9d0e
parent ca4e6b4b5964a8024296fb5de0afd82f6dbe3e4d

Merge "resolve merge conflicts of 26b174659 to ub-launcher3-master" into ub-launcher3-master

src/com/android/launcher3/compat/LauncherAppsCompat.java

diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java
index 4580b81..b03a302 100644
--- a/src/com/android/launcher3/compat/LauncherAppsCompat.java
+++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java
@@ -32,7 +32,7 @@
 import com.android.launcher3.Utilities;
 import com.android.launcher3.graphics.LauncherIcons;
 import com.android.launcher3.shortcuts.ShortcutInfoCompat;
-import com.android.launcher3.util.LooperExecuter;
+import com.android.launcher3.util.LooperExecutor;
 
 import java.util.List;
 
@@ -113,7 +113,7 @@
                 }
             } else {
                 // Block the worker thread until the accept() is called.
-                new LooperExecuter(LauncherModel.getWorkerLooper()).execute(new Runnable() {
+                new LooperExecutor(LauncherModel.getWorkerLooper()).execute(new Runnable() {
                     @Override
                     public void run() {
                         try {