| commit | 481a75fcfa81f0869f8e68c9f95390fb924ac2c5 | [log] [tgz] |
|---|---|---|
| author | satok <satok@satok-macbookpro.local> | Sat Jul 17 19:20:35 2010 +0900 |
| committer | satok <satok@satok-macbookpro.local> | Sat Jul 17 19:20:35 2010 +0900 |
| tree | db7c2acdeaa1df16a545b17cdd2002046eb2004b | |
| parent | cbd4592fe1f2bce822044099246709f7802d5aa8 [diff] | |
| parent | 44f92495c1a916c89a603266977fb15a8c64372a [diff] |
Merge remote branch 'goog/master' Conflicts: java/src/com/android/inputmethod/latin/LatinIME.java