satok 9c383385d5 Merge remote branch 'goog/master' into merge ...

Conflicts:
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: If30410c4814c3224f87698c165312494c0efca23

2011-01-19 20:33:55 +09:00

..

jni

Fixes in close() in BinaryDictionary.

2011-01-17 15:58:07 +09:00

src

Load main dic in native

2011-01-07 19:51:45 +09:00

Android.mk

Merge remote branch 'goog/master' into merge

2011-01-14 13:45:21 +09:00