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

Change-Id: I8a8c6d2c1f3bafb2f6e86a2381b88933b6ac3718
2011-01-14 19:14:36 +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