satok eca9637390 Merge remote branch 'goog/master' into merge4 ... Conflicts: java/res/values/strings.xml Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90		2010-09-07 22:37:39 +09:00
..
res	Merge remote branch 'goog/master' into merge4	2010-09-07 22:37:39 +09:00
src/com/android/inputmethod	Merge remote branch 'goog/master' into merge4	2010-09-07 22:37:39 +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	Delete version	2010-08-27 16:20: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