satok a511e0b432 Merge remote branch 'goog/master' into merge
Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/deprecated/VoiceProxy.java
	java/src/com/android/inputmethod/keyboard/KeyboardId.java
	java/src/com/android/inputmethod/latin/BinaryDictionary.java
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/latin/Utils.java

Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5
2011-03-25 15:17:08 -07:00
..
2010-11-29 17:57:48 +09:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-17 16:56:28 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-17 16:56:28 -07:00
2011-03-15 10:48:11 -07:00
2011-03-01 11:03:19 -08:00
2011-03-15 10:48:11 -07:00
2011-03-17 16:56:28 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00