satok 04c10734d0 am d6ce8d98: am 257b2a58: Merge "Hide recognition view when switchToLastInputMethod failed." into honeycomb ... * commit 'd6ce8d98427f221ccb4379b7c96e649fdf419acc': Hide recognition view when switchToLastInputMethod failed.		2011-01-25 19:27:30 -08:00
..
res	resolved conflicts for merge of f73d2386 to master	2011-01-26 00:49:20 +09:00
src/com/android/inputmethod	Merge "Hide recognition view when switchToLastInputMethod failed." into honeycomb	2011-01-25 19:23:56 -08:00
Android.mk	Consolidate main dictionary files.	2011-01-05 11:31:58 +09:00
AndroidManifest.xml	Remove LatinIME prefix from classes	2010-12-09 21:54:51 +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	Remove multi-tap feature	2010-12-20 21:58:31 +09:00