diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-03-18 18:55:25 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-03-18 18:55:25 -0700 |
| commit | 3b93f0e9a7fa5c26c016288b1fed63365ae0fa58 (patch) | |
| tree | 7c8db0e5590677297ee5a2125ee81f67dfaef383 /java/src/com/android/inputmethod/dictionarypack/DictionaryService.java | |
| parent | 68c09b56bf684e5bc5b8e65ad0f20b538f78a56a (diff) | |
| parent | 841c295f3c99214f45924434d9c0bb5b4760578d (diff) | |
| download | latinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.tar.gz latinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.tar.xz latinime-3b93f0e9a7fa5c26c016288b1fed63365ae0fa58.zip | |
am 841c295f: resolved conflicts for merge of 5b048292 to master
* commit '841c295f3c99214f45924434d9c0bb5b4760578d':
Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/DictionaryService.java')
0 files changed, 0 insertions, 0 deletions