satok e75e4463cd Merge remote-tracking branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d		2011-04-20 18:16:18 +09:00
..
res	Merge remote-tracking branch 'goog/master' into merge	2011-04-20 18:16:18 +09:00
src/com/android/inputmethod	Merge remote-tracking branch 'goog/master' into merge	2011-04-20 18:16:18 +09:00
Android.mk	Fix lib and compat bugs.	2011-03-25 18:42:23 -07:00
AndroidManifest.xml	Merge remote branch 'goog/master' into merge	2011-02-10 17:31:37 +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	Add Utils.equalsIgnoreCase methods	2011-03-16 16:03:05 -07:00