satok def6b35a9e Merge remote-tracking branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml Change-Id: I455cb689f3a1baca7cc8b8ef88d9dbcdca8128a3		2011-05-13 21:11:19 +09:00
..
res	Merge remote-tracking branch 'goog/master' into merge	2011-05-13 21:11:19 +09:00
src/com/android/inputmethod	Merge remote-tracking branch 'goog/master' into merge	2011-05-13 21:11:19 +09:00
Android.mk	Fix lib and compat bugs.	2011-03-25 18:42:23 -07:00
AndroidManifest.xml	Check the availability of layouts for showing the input languages in the settings	2011-04-21 17:17:32 +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