tree c61a78ca0af60c98e288c90742303e0d725a1f31
parent 81f14d706de4a6dda1320cd41f464c0ea440092d
parent 2b2255d1860a54e62766db78ef8ed07553a1692e
author Michael Kolb <kolby@google.com> 1296501457 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296501457 -0800

am 2b2255d1: Merge "fix IME bug" into honeycomb

* commit '2b2255d1860a54e62766db78ef8ed07553a1692e':
  fix IME bug