Tadashi G. Takaoka 2e7ce8ec50 am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbread ... Merge commit '259778c3a18246b3117c2874b87f1adaf2d9fb81' * commit '259778c3a18246b3117c2874b87f1adaf2d9fb81': Disable suggestion selection preview popup		2010-09-30 13:37:23 -07:00
..
res	resolved conflicts for merge of ab1348e8 to master	2010-09-30 09:01:04 +09:00
src/com/android/inputmethod	am 259778c3: am eebe37e8: Merge "Disable suggestion selection preview popup" into gingerbread	2010-09-30 13:37:23 -07:00
Android.mk	Fix proguard flag file dependency.	2010-09-29 15:21:28 -07:00
AndroidManifest.xml	Add Debug Settings Activity	2010-09-27 14:07:10 +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	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00