a511e0b432
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 |
||
---|---|---|
dictionaries | ||
java | ||
native | ||
tests | ||
tools | ||
Android.mk | ||
CleanSpec.mk |