satok a7ea6cad82 Merge remote branch 'goog/master' into merge ...

Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8

2011-02-10 17:31:37 +09:00

..

res

Merge remote branch 'goog/master' into merge

2011-02-10 17:31:37 +09:00

src/com/android/inputmethod

Merge remote branch 'goog/master' into merge

2011-02-10 17:31:37 +09:00

Android.mk

Consolidate main dictionary files.

2011-01-05 11:31:58 +09: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

Remove multi-tap feature

2010-12-20 21:58:31 +09:00