diff options
| author |   satok <satok@google.com> | 2011-02-10 17:31:37 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-02-10 17:31:37 +0900 |
| commit | a7ea6cad8269c2b621dbf585ed90121b495f6ebc (patch) | |
| tree | efe9106dacb45cf2cf4f17d80f870a030436ca53 /java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java | |
| parent | b7b83125544964bf128e07456edfd0170d889dc4 (diff) | |
| parent | 03b5579b3b7380f8e12519cca1662317282c6bd9 (diff) | |
| download | latinime-a7ea6cad8269c2b621dbf585ed90121b495f6ebc.tar.gz latinime-a7ea6cad8269c2b621dbf585ed90121b495f6ebc.tar.xz latinime-a7ea6cad8269c2b621dbf585ed90121b495f6ebc.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/voice/VoiceIMEConnector.java
Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8
Diffstat (limited to 'java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java')
0 files changed, 0 insertions, 0 deletions