Tadashi G. Takaoka b050829609 am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice input ... Merge commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a' * commit 'e6e45510674b31d0c82fa5f8a7943668d7e8503a': Disable suggestion bar before invoke Voice input		2010-09-30 13:37:30 -07:00
..
res	resolved conflicts for merge of ab1348e8 to master	2010-09-30 09:01:04 +09:00
src/com/android/inputmethod	am e6e45510: am 11a578f4: Disable suggestion bar before invoke Voice input	2010-09-30 13:37:30 -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