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

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