satok b9c57e6540 Merge remote branch 'goog/master' ... Conflicts: java/res/xml/prefs.xml java/src/com/android/inputmethod/latin/BinaryDictionary.java java/src/com/android/inputmethod/latin/Dictionary.java java/src/com/android/inputmethod/latin/ExpandableDictionary.java java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/Suggest.java tests/src/com/android/inputmethod/latin/tests/SuggestTests.java		2010-07-16 13:02:45 +09:00
..
latin	Merge remote branch 'goog/master'	2010-07-16 13:02:45 +09:00