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

* commit '6e38d26c1e66cc957c33d4263013e02623ebd6da':
  Fix the sort order of the input methods & subtypes in the settings.