resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp

Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65

diff --cc src/com/android/settings/dashboard/DashboardSummary.java
index 0362017,12f036a..c7542e1
--- 1/src/com/android/settings/dashboard/DashboardSummary.java
--- 2/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@@ -112,13 -126,7 +126,7 @@@ public class DashboardSummary extends I
                  MetricsLogger.visible(getContext(), c.getMetricsConstant());
              }
          }
-         if (mAdapter.getSuggestions() != null) {
-             for (Tile suggestion : mAdapter.getSuggestions()) {
-                 MetricsLogger.action(getContext(), MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                         DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));
-             }
-         }
 -        if (DEBUG_TIMING) Log.d(TAG, "onStart took " + (System.currentTimeMillis() - startTime)
 +        if (DEBUG_TIMING) Log.d(TAG, "onResume took " + (System.currentTimeMillis() - startTime)
                  + " ms");
      }