satok e5585c1854 Merge remote branch 'goog/master' into merge
Conflicts:
	java/src/com/android/inputmethod/latin/BinaryDictionary.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java

Change-Id: Ib2b4acc9dd570d5f37b6aa455e2f07b0a884944a
2011-01-14 13:45:21 +09:00
..
2011-01-11 17:28:27 +09:00
2010-12-24 11:26:26 +09:00
2010-11-29 17:57:48 +09:00