satok 9d2e059f83 Merge commit 'goog/master' ... Conflicts: java/src/com/android/inputmethod/latin/LatinIME.java		2010-07-01 05:11:23 +09:00
..
strings.xml	Merge commit 'goog/master'	2010-07-01 05:11:23 +09:00