diff options
| author |   satok <satok@google.com> | 2011-03-25 15:17:08 -0700 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-03-25 15:17:08 -0700 |
| commit | a511e0b432f04946b051a0fdaad8968754b3baf2 (patch) | |
| tree | aae1c69e25ef45dbc4eff4ddbb1fd285ce582370 /java/src/com/android/inputmethod/latin/AutoDictionary.java | |
| parent | 296100fd5adc41fc894a2efd71567e0a4bedc705 (diff) | |
| parent | f1a81f5eb37df4170de2cf6327c860e3d64dc2f8 (diff) | |
| download | latinime-a511e0b432f04946b051a0fdaad8968754b3baf2.tar.gz latinime-a511e0b432f04946b051a0fdaad8968754b3baf2.tar.xz latinime-a511e0b432f04946b051a0fdaad8968754b3baf2.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
java/src/com/android/inputmethod/deprecated/VoiceProxy.java
java/src/com/android/inputmethod/keyboard/KeyboardId.java
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Settings.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/latin/Utils.java
Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5
Diffstat (limited to 'java/src/com/android/inputmethod/latin/AutoDictionary.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AutoDictionary.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/AutoDictionary.java b/java/src/com/android/inputmethod/latin/AutoDictionary.java index 307b81d43..a00b0915c 100644 --- a/java/src/com/android/inputmethod/latin/AutoDictionary.java +++ b/java/src/com/android/inputmethod/latin/AutoDictionary.java @@ -27,6 +27,7 @@ import android.provider.BaseColumns; import android.util.Log; import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; import java.util.Set; |