satok e932a0ae78 Merge remote branch 'goog/master' into merge ... Conflicts: java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java java/src/com/android/inputmethod/deprecated/voice/VoiceInputLogger.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java Change-Id: Ibcb1aa61cbab8ff1863260a579d26d065ee7bd40		2011-03-25 19:24:19 -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 19:24:19 -07:00
Android.mk	Fix lib and compat bugs.	2011-03-25 18:42:23 -07: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