diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-03-19 10:48:10 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2013-03-19 10:48:10 +0900 |
| commit | 841c295f3c99214f45924434d9c0bb5b4760578d (patch) | |
| tree | 62226e13d2674b0e99e0d49a899aa30ab6b5eb91 /java/src/com/android/inputmethod/latin/Utils.java | |
| parent | bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0 (diff) | |
| parent | 5b048292540b6fbbd8929a3622262f352245d464 (diff) | |
| download | latinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.gz latinime-841c295f3c99214f45924434d9c0bb5b4760578d.tar.xz latinime-841c295f3c99214f45924434d9c0bb5b4760578d.zip | |
resolved conflicts for merge of 5b048292 to master
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Utils.java')
0 files changed, 0 insertions, 0 deletions