Tadashi G. Takaoka f48637a5b2 resolved conflicts for merge of 0325360d to master ... Change-Id: I5926c8d75dbffda20001fa9487fae2e5f723c755		2010-09-29 13:51:06 +09:00
..
res	resolved conflicts for merge of 0325360d to master	2010-09-29 13:51:06 +09:00
src/com/android/inputmethod	am 0ea7e504: am 6e5a3986: Fixed key code and key coordinates when move debounce has been in action	2010-09-28 13:19:45 -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