tree d03c65e4713cde8b8b21ce3cd2b7f7c043045447
parent 13492c848f0fcf1ee3868228622641ca8bce6fb1
parent 74a909bc78e07b7626144ff3c4fc88fcd0d5b8d3
author Ken Wakasa <kwakasa@google.com> 1299267433 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299267433 -0800

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.