diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-06-13 06:45:38 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-06-13 06:45:38 +0900 |
| commit | 84bb18f4c959355cc88a8d18db0e7466f93e4267 (patch) | |
| tree | 70768502a554f63095dffb06ead04a3a7cc402bc /java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java | |
| parent | 58d9e46ce0594989eb7a89be15b29472351cb01f (diff) | |
| parent | ee78e780fcf598b49a04d1a49932ef85c442eb11 (diff) | |
| download | latinime-84bb18f4c959355cc88a8d18db0e7466f93e4267.tar.gz latinime-84bb18f4c959355cc88a8d18db0e7466f93e4267.tar.xz latinime-84bb18f4c959355cc88a8d18db0e7466f93e4267.zip | |
resolved conflicts for merge of ee78e780 to master
Change-Id: I88a4996bdd17c5378a67781d8075eff311670c3b
Diffstat (limited to 'java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java')
0 files changed, 0 insertions, 0 deletions