commit c0748a19909d8863f54ae0482bf1614421f19dd8
author Jean Chalard <jchalard@google.com> Thu Jun 26 18:44:26 2014 +0900
committer Jean Chalard <jchalard@google.com> Thu Jun 26 18:44:54 2014 +0900
tree 930bafbab45eba580803071de04ef0e89ca0d24f
parent 310bb2c76f0a7a5cf97b47d029096d6296cdfd0b

Fix the build

That was a merge not well resolved by git >.>

Change-Id: I3cd042d6a5206daf1e9942358405d647c67423dd

java/src/com/android/inputmethod/latin/Suggest.java

diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 2a56861..692c03a 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -128,7 +128,7 @@
 
         final String whitelistedWord;
         if (suggestionsContainer.isEmpty()) {
-            whitelistedWord = firstSuggestion = null;
+            whitelistedWord = null;
         } else {
             final SuggestedWordInfo firstSuggestedWordInfo = suggestionsContainer.get(0);
             final String firstSuggestion = firstSuggestedWordInfo.mWord;