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.
tree: a14464123bebfff64910d7c44b1759a699a6caa8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE