am 31d9d895: Merge "Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals"." into honeycomb

* commit '31d9d895d79977fa4e6dff2491b209fbeb21c61b':
  Update shortcut IME when asked. And match the language of subtype by "startWith" not "equals".