am 317b2ea1: Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb

* commit '317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5':
  Add android.provider.Settings.EXTRA_INPUT_METHOD_ID