am d56f8f5c: (-s ours) am 979f8690: DO NOT MERGE. Backport LatinIME from master to Gingerbread
Merge commit 'd56f8f5c10d6a959c23fda6ba0a588198fe7412b' * commit 'd56f8f5c10d6a959c23fda6ba0a588198fe7412b': DO NOT MERGE. Backport LatinIME from master to Gingerbreadmain
commit
36cd376aee