diff options
| author |   satok <satok@google.com> | 2011-04-13 18:51:21 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-13 18:51:21 +0900 |
| commit | d05c6e88347c9129dabe40eebf785c4758d0816c (patch) | |
| tree | 1175bc6a611cbdcc56d3d408d87175d755ec3759 /java/src/com/android/inputmethod/latin/CandidateView.java | |
| parent | cc6131053f34f5d69f463ea4513cebb93453fa49 (diff) | |
| parent | a6abb1f87c0061d7a409066586ba99d8fdbd86e2 (diff) | |
| download | latinime-d05c6e88347c9129dabe40eebf785c4758d0816c.tar.gz latinime-d05c6e88347c9129dabe40eebf785c4758d0816c.tar.xz latinime-d05c6e88347c9129dabe40eebf785c4758d0816c.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
Change-Id: I033d512e23c84d6c803805c9b05eec88969f97df
Diffstat (limited to 'java/src/com/android/inputmethod/latin/CandidateView.java')
0 files changed, 0 insertions, 0 deletions