resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e

diff --cc src/com/android/launcher2/AppsCustomizePagedView.java
Simple merge

diff --cc src/com/android/launcher2/AppsCustomizeTabHost.java
Simple merge

diff --cc src/com/android/launcher2/Launcher.java
Simple merge

diff --cc src/com/android/launcher2/LauncherModel.java
index 637f68c,92be7e4..7927593
--- 1/src/com/android/launcher2/LauncherModel.java
--- 2/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@@ -1781,8 -1685,8 +1781,8 @@@ public class LauncherModel extends Broa
              // shallow copy
              @SuppressWarnings("unchecked")
              final ArrayList<ApplicationInfo> list
 -                    = (ArrayList<ApplicationInfo>) mAllAppsList.data.clone();
 +                    = (ArrayList<ApplicationInfo>) mBgAllAppsList.data.clone();
-             mHandler.post(new Runnable() {
+             Runnable r = new Runnable() {
                  public void run() {
                      final long t = SystemClock.uptimeMillis();
                      final Callbacks callbacks = tryGetCallbacks(oldCallbacks);