resolved conflicts for merge of 9cd60fe1 to mnc-dr-dev

Change-Id: I8c7e0f48dad8eff174df4ffdebeeb9467fd799a0

2 files changed, 8 insertions, 7 deletions

diff --git a/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java b/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
index d8951df86..512d426aa 100644
--- a/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
+++ b/java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
@@ -19,16 +19,11 @@ package com.android.inputmethod.dictionarypack;
 import android.content.Context;
 
 /**
- * Helper to get the metadata URI from its base URI and the additional ID, if any.
+ * Helper to get the metadata URI from its base URI.
  */
 @SuppressWarnings("unused")
 public class MetadataUriGetter {
-    private MetadataUriGetter() {
-        // This helper class is not instantiable.
-    }
-
-    public static String getUri(final Context context, final String baseUri,
-            final String additionalId) {
+    public static String getUri(final Context context, final String baseUri) {
         return baseUri;
     }
 }
diff --git a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
index c069a0f64..03e58478b 100644
--- a/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
+++ b/java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
@@ -101,4 +101,10 @@ public final class StatsUtils {
 
     public static void onSettingsActivity(final String entryPoint) {
     }
+
+    public static void onInputConnectionLaggy(final int operation, final long duration) {
+    }
+
+    public static void onDecoderLaggy(final int operation, final long duration) {
+    }
 }