am 5978c628: am d7ba8143: Merge "Fix the issue on the inconsistent condition...
am 5978c628: am d7ba8143: Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev
* commit '5978c628':
Fix the issue on the inconsistent condition of InputMethodSubtype