satok a511e0b432 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		2011-03-25 15:17:08 -07:00
..
data	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
res/raw	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
src/com/android/inputmethod	Add different ways of reading the dictionary file.	2011-03-18 12:16:50 -07:00
Android.mk	Merge remote branch 'goog/master' into merge	2011-03-25 15:17:08 -07:00
AndroidManifest.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00