diff options
| author |   satok <satok@google.com> | 2011-04-20 18:16:18 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-20 18:16:18 +0900 |
| commit | e75e4463cdd2b9ba672faa6b0b1a6e3083e61543 (patch) | |
| tree | 199f30b9b0b640d5b800cb974dd30550e1984e41 /java/src/com/android/inputmethod/compat/InputConnectionCompatUtils.java | |
| parent | d8cf67623903adc66db8dffb88805e71ec4b3425 (diff) | |
| parent | 5454ff5a66e681a034ceae6ffc9847ed9eb959d3 (diff) | |
| download | latinime-e75e4463cdd2b9ba672faa6b0b1a6e3083e61543.tar.gz latinime-e75e4463cdd2b9ba672faa6b0b1a6e3083e61543.tar.xz latinime-e75e4463cdd2b9ba672faa6b0b1a6e3083e61543.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
java/res/xml/prefs.xml
Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d
Diffstat (limited to 'java/src/com/android/inputmethod/compat/InputConnectionCompatUtils.java')
0 files changed, 0 insertions, 0 deletions