Ken Wakasa 39004972b1 resolved conflicts for merge of fd64e47c to master ... Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085		2010-10-12 03:15:36 +09:00
..
res	resolved conflicts for merge of fd64e47c to master	2010-10-12 03:15:36 +09:00
src/com/android/inputmethod	resolved conflicts for merge of fd64e47c to master	2010-10-12 03:15:36 +09: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