diff options
| author |   satok <satok@google.com> | 2011-01-14 19:14:36 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-01-14 19:14:36 +0900 |
| commit | 6014f1c92b8ea446b98a66429c232cd652f896ef (patch) | |
| tree | aa6e256ad2f59c06c9f8651ff5f0f11208b7024d /java/src/com/android/inputmethod/compat | |
| parent | b676d479e5d8d29c2b3d371b7df5ec949237d136 (diff) | |
| parent | e0df0fe957fee721365ab371d67206c1f90ecf24 (diff) | |
| download | latinime-6014f1c92b8ea446b98a66429c232cd652f896ef.tar.gz latinime-6014f1c92b8ea446b98a66429c232cd652f896ef.tar.xz latinime-6014f1c92b8ea446b98a66429c232cd652f896ef.zip | |
Merge remote branch 'goog/master' into merge
Conflicts:
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: I8a8c6d2c1f3bafb2f6e86a2381b88933b6ac3718
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
0 files changed, 0 insertions, 0 deletions