am 45bbdc20: Merge "Rename variable name to remove ambiguity"

* commit '45bbdc20bb613a84fef35fe685ead394c7b06d57':
  Rename variable name to remove ambiguity

1 files changed, 3 insertions, 3 deletions

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 0b61dc18b..1c54a20e7 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -823,14 +823,14 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
                 int token = 0;
                 do {
                     // TODO: We need a new API that returns *new* un-synced data.
-                    final BinaryDictionary.GetNextWordPropertyResult result =
+                    final BinaryDictionary.GetNextWordPropertyResult nextWordPropertyResult =
                             binaryDictionary.getNextWordProperty(token);
-                    final WordProperty wordProperty = result.mWordProperty;
+                    final WordProperty wordProperty = nextWordPropertyResult.mWordProperty;
                     if (wordProperty == null) {
                         break;
                     }
                     wordPropertyList.add(wordProperty);
-                    token = result.mNextToken;
+                    token = nextWordPropertyResult.mNextToken;
                 } while (token != 0);
                 result.set(wordPropertyList.toArray(new WordProperty[wordPropertyList.size()]));
             }