Kenny Root 6f6dd71862 resolved conflicts for merge of 23d50bfb to master ... Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6		2010-10-10 15:19:53 -07:00
..
res	resolved conflicts for merge of 23d50bfb to master	2010-10-10 15:19:53 -07:00
src/com/android/inputmethod	resolved conflicts for merge of 23d50bfb to master	2010-10-10 15:19:53 -07: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