tree 707682695bc61d5a6d8450ad25b2476f40cd2698
parent 6e8831cf2d7fd90ab124f58a9fc1919fac818887
parent 317b2ea16a9ba681ee185d5b7a0c385a1fdbe1d5
author Tadashi G. Takaoka <takaoka@google.com> 1295537834 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295537834 -0800

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

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