diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-09-13 10:41:19 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-09-13 10:41:19 +0900 |
| commit | 64176158e7ce9c99365d20433c81012ea7e36729 (patch) | |
| tree | c238bc7e10cb1a29d713b397feac8302b9ab8351 /java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java | |
| parent | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 (diff) | |
| parent | 75513e5113ab31c4c508e19b3b42de6a9caf10ee (diff) | |
| download | latinime-64176158e7ce9c99365d20433c81012ea7e36729.tar.gz latinime-64176158e7ce9c99365d20433c81012ea7e36729.tar.xz latinime-64176158e7ce9c99365d20433c81012ea7e36729.zip | |
resolved conflicts for merge of 75513e51 to master
Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/DictionaryProvider.java')
0 files changed, 0 insertions, 0 deletions