diff options
| author |   satok <satok@google.com> | 2011-01-19 20:33:55 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-01-19 20:33:55 +0900 |
| commit | 9c383385d5fb82496d7e7ca57826fc21ec8a6bbd (patch) | |
| tree | fb22e4f5f76c6b8d9e3833ba837c7fbde018f645 /java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java | |
| parent | 6014f1c92b8ea446b98a66429c232cd652f896ef (diff) | |
| parent | 86497c88d2647dc8af51fc34b6b61ce2c846203c (diff) | |
| download | latinime-9c383385d5fb82496d7e7ca57826fc21ec8a6bbd.tar.gz latinime-9c383385d5fb82496d7e7ca57826fc21ec8a6bbd.tar.xz latinime-9c383385d5fb82496d7e7ca57826fc21ec8a6bbd.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/src/com/android/inputmethod/latin/Settings.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
Change-Id: If30410c4814c3224f87698c165312494c0efca23
Diffstat (limited to 'java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java')
0 files changed, 0 insertions, 0 deletions