diff options
| author |   Kenny Root <kroot@google.com> | 2010-10-10 15:19:53 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-10 15:19:53 -0700 |
| commit | 6f6dd71862e09c6c296fc1e5b9c8af35604824be (patch) | |
| tree | f403012f874d4ec099dcade81719774691e750e1 /java/src/com/android/inputmethod/latin/ProximityKeyDetector.java | |
| parent | e3b34081d63d5aedf55e8082279cbeff8d14e6bd (diff) | |
| parent | 23d50bfb13b5def0bc226122baed15ddcace42f6 (diff) | |
| download | latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.tar.gz latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.tar.xz latinime-6f6dd71862e09c6c296fc1e5b9c8af35604824be.zip | |
resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
Diffstat (limited to 'java/src/com/android/inputmethod/latin/ProximityKeyDetector.java')
0 files changed, 0 insertions, 0 deletions