satok e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master ... Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12		2010-09-07 15:37:32 +09:00
..
res	resolved conflicts for merge of 36d2d0e7 to master	2010-09-07 15:37:32 +09:00
src/com/android/inputmethod	resolved conflicts for merge of 36d2d0e7 to master	2010-09-07 15:37:32 +09:00
Android.mk	Change all-subdir-java-files to all-java-files-under,src	2010-08-25 18:12:18 +09:00
AndroidManifest.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +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