Tadashi G. Takaoka e3da18803d am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" into gingerbread ... Merge commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343' * commit 'fcd5f2b9b4229c00a6589aad1fda9b727759d343': Mini keyboard works even while shift is being pressed		2010-09-28 21:55:19 -07:00
..
res	resolved conflicts for merge of 0325360d to master	2010-09-29 13:51:06 +09:00
src/com/android/inputmethod	am fcd5f2b9: am c2c9cd82: Merge "Mini keyboard works even while shift is being pressed" into gingerbread	2010-09-28 21:55:19 -07:00
Android.mk	Change all-subdir-java-files to all-java-files-under,src	2010-08-25 18:12:18 +09: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