satok 481a75fcfa Merge remote branch 'goog/master' ...

Conflicts:
	java/src/com/android/inputmethod/latin/LatinIME.java

2010-07-17 19:20:35 +09:00

..

res

Merge remote branch 'goog/master'

2010-07-16 13:02:45 +09:00

src/com/android/inputmethod

Merge remote branch 'goog/master'

2010-07-17 19:20:35 +09:00

Android.mk

Merge remote branch 'goog/master'

2010-07-16 13:02:45 +09:00

AndroidManifest.xml

Change version to 0.21

2010-07-16 17:42:33 +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

Tests and some new constructors to help in testing.

2010-05-07 13:40:20 -07:00