diff options
| author |   satok <satok@google.com> | 2011-05-13 21:11:19 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-05-13 21:11:19 +0900 |
| commit | def6b35a9ed78d128d4cb5e8414c865503ec4192 (patch) | |
| tree | 77491cd71b65419fa63d1aacc28288e7e9f8aa99 /java/src/com/android/inputmethod/latin/DictionaryCollection.java | |
| parent | 55f38adab99937eef97626136f57520ebe9c04a9 (diff) | |
| parent | 96e822c94c50c548d64e86e0c2c52022a63cc319 (diff) | |
| download | latinime-def6b35a9ed78d128d4cb5e8414c865503ec4192.tar.gz latinime-def6b35a9ed78d128d4cb5e8414c865503ec4192.tar.xz latinime-def6b35a9ed78d128d4cb5e8414c865503ec4192.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
Change-Id: I455cb689f3a1baca7cc8b8ef88d9dbcdca8128a3
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
0 files changed, 0 insertions, 0 deletions