resolve merge conflicts of 0c2f0700a5 to ub-launcher3-master.

Change-Id: I92f38e9f4ac4d9b6c5a3000e0971d2bc417bd3c6

diff --cc src/com/android/launcher3/AppInfo.java
index 7249c64,ede6c71..1923df7
--- 1/src/com/android/launcher3/AppInfo.java
--- 2/src/com/android/launcher3/AppInfo.java
+++ b/src/com/android/launcher3/AppInfo.java
@@@ -125,8 -121,7 +118,7 @@@ public class AppInfo extends ItemInfo 
      public static void dumpApplicationInfoList(String tag, String label, ArrayList<AppInfo> list) {
          Log.d(tag, label + " size=" + list.size());
          for (AppInfo info: list) {
 -            Log.d(tag, "   title=\"" + info.title + "\" iconBitmap=" + info.iconBitmap 
 +            Log.d(tag, "   title=\"" + info.title + "\" iconBitmap=" + info.iconBitmap
-                     + " firstInstallTime=" + info.firstInstallTime
                      + " componentName=" + info.componentName.getPackageName());
          }
      }

diff --cc src/com/android/launcher3/ShortcutInfo.java
Simple merge