diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-08-27 09:52:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-08-27 09:52:59 +0000 |
| commit | 1c356ebee60941872e72e5afeb0494824732f274 (patch) | |
| tree | 823c57511c89f6ead04f7ef44f5dd54bc7363a97 /java/src/com/android/inputmethod/latin/RichInputConnection.java | |
| parent | 7d8dad7ab0a76bc647201b1f48a52aa95ace219b (diff) | |
| parent | c1596086d3de32b66a382acf2c9b5fa00779008f (diff) | |
| download | latinime-1c356ebee60941872e72e5afeb0494824732f274.tar.gz latinime-1c356ebee60941872e72e5afeb0494824732f274.tar.xz latinime-1c356ebee60941872e72e5afeb0494824732f274.zip | |
am c1596086: resolved conflicts for merge of 0268f736 to master
* commit 'c1596086d3de32b66a382acf2c9b5fa00779008f':
Introduce commit/add-to-dictionary indicators
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputConnection.java')
0 files changed, 0 insertions, 0 deletions