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

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