tree 0e1727820b6a6a4cfecfb9be26547dd08b8bb1f0
parent c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a
parent b4788fdbfdda97bd9cfd0e483276934114d9c438
author satok <satok@google.com> 1305898863 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305898863 -0700

am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework