Conflicts: java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java Conflict resolved by matching code with jb-mr2-dev.
f4d7c99c
71c1e50f