| commit | b9c57e6540502ef3b2941235bbbede4dedfdcfb7 | [log] [tgz] |
|---|---|---|
| author | satok <satok@exia.tok.corp.google.com> | Fri Jul 16 13:02:45 2010 +0900 |
| committer | satok <satok@exia.tok.corp.google.com> | Fri Jul 16 13:02:45 2010 +0900 |
| tree | c8ccdc1455ab21eaef06c2b053ac7cada78de9f9 | |
| parent | b5a0d8ef42d9e0be4e56be04637c167074447744 [diff] | |
| parent | 2a118d844e0b7dd3e01f25e937b02b05711768a6 [diff] |
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