Tadashi G. Takaoka 8bae0829d2 resolved conflicts for merge of ab1348e8 to master ... Change-Id: Ica94a5f9ac4feae477297f14fc1bc21d02efb6a4		2010-09-30 09:01:04 +09:00
..
res	resolved conflicts for merge of ab1348e8 to master	2010-09-30 09:01:04 +09:00
src/com/android/inputmethod	resolved conflicts for merge of ab1348e8 to master	2010-09-30 09:01:04 +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	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