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
..
res	Merge remote branch 'goog/master' into merge	2011-03-25 15:17:08 -07:00
src/com/android/inputmethod	Merge remote branch 'goog/master' into merge	2011-03-25 15:17:08 -07:00
Android.mk	Consolidate main dictionary files.	2011-01-05 11:31:58 +09:00
AndroidManifest.xml	Merge remote branch 'goog/master' into merge	2011-02-10 17:31:37 +09:00
MODULE_LICENSE_APACHE2	Clarify licensing	2010-04-05 09:47:36 -07:00
NOTICE	Clarify licensing	2010-04-05 09:47:36 -07:00
proguard.flags	Add Utils.equalsIgnoreCase methods	2011-03-16 16:03:05 -07:00