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
..
2011-02-10 17:31:37 +09:00
2011-03-01 13:44:48 -08:00
2011-03-01 13:44:48 -08:00
2011-03-01 17:41:59 -08:00
2011-03-01 17:41:59 -08:00
2011-01-18 15:49:17 +00:00
2011-03-16 23:00:59 -07:00
2010-12-16 12:38:43 +09:00
2010-11-29 17:57:48 +09:00
2011-03-25 15:17:08 -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-02-11 13:15:38 -08: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
2010-12-08 17:43:29 +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-17 16:56:28 -07:00
2011-03-15 10:48:11 -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
2011-02-08 12:44:03 +09:00
2010-12-17 16:56:49 +09:00
2011-03-15 10:48:11 -07:00
2011-03-15 10:48:11 -07:00
2011-03-25 15:17:08 -07:00
2011-03-24 00:32:10 -07:00
2011-01-27 15:21:01 +09:00
2011-01-27 15:21:01 +09:00
2010-12-17 17:18:28 +09:00
2011-01-27 15:21:01 +09:00
2010-12-17 17:18:28 +09:00
2010-12-17 17:18:28 +09:00
2010-12-17 17:18:28 +09:00
2011-01-27 15:21:01 +09:00
2011-03-24 00:32:10 -07:00
2011-01-27 15:21:01 +09:00
2011-01-27 15:21:01 +09:00
2011-01-27 15:21:01 +09:00
2011-01-27 15:21:01 +09:00
2011-03-24 00:32:10 -07:00
2010-12-17 17:18:28 +09:00