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