satok cc6131053f Merge remote-tracking branch 'goog/master' into deldebug ...

Conflicts:
	java/res/xml/prefs.xml

Change-Id: Id09bebfe996f0c6a4b906e7225a6d0ac0d01a9a1

2011-04-07 12:57:10 +09:00

..

res

Merge remote-tracking branch 'goog/master' into deldebug

2011-04-07 12:57:10 +09:00

src/com/android/inputmethod

Merge remote-tracking branch 'goog/master' into deldebug

2011-04-07 12:57:10 +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