Merge remote-tracking branch 'goog/master' into mergescript

Conflicts:
	java/src/com/android/inputmethod/latin/SuggestedWords.java

Change-Id: I1ce6cd0846cb93a5c9bb2d9c3638d59f90232c26

1 files changed, 2 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 7fffc31c0..69b48cecc 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -768,9 +768,9 @@ public class AndroidSpellCheckerService extends SpellCheckerService
                             codePoint, mScript);
                     if (SpellCheckerProximityInfo.NOT_A_COORDINATE_PAIR == xy) {
                         composer.add(codePoint, WordComposer.NOT_A_COORDINATE,
-                                WordComposer.NOT_A_COORDINATE, null);
+                                WordComposer.NOT_A_COORDINATE);
                     } else {
-                        composer.add(codePoint, xy & 0xFFFF, xy >> 16, null);
+                        composer.add(codePoint, xy & 0xFFFF, xy >> 16);
                     }
                 }