am 74a909bc: am 6e38d26c: Merge "Fix the sort order of the input methods &...
am 74a909bc: am 6e38d26c: Merge "Fix the sort order of the input methods & subtypes in the settings." into honeycomb-mr1
* commit '74a909bc':
Fix the sort order of the input methods & subtypes in the settings.