satok 9d2e059f83 Merge commit 'goog/master' ...

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

2010-07-01 05:11:23 +09:00

..

res

Merge commit 'goog/master'

2010-07-01 05:11:23 +09:00

src/com/android/inputmethod

Merge commit 'goog/master'

2010-07-01 05:11:23 +09:00

Android.mk

Update the cert to catch up with a bug fix - https://android-git.corp.google.com/g/53188

2010-06-07 23:49:22 +09:00

AndroidManifest.xml

change version code

2010-06-30 13:18:39 +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