tree b442d37657f1b4a98462e130b13278a42e169768
parent d692ea6dd297fbd39885525a29bdf6637a3640f2
parent 5327322ab94711a654d41a5b53be3bf6a3a28a39
author Satoshi Kataoka <satok@google.com> 1357870511 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357870511 -0800

am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev

* commit '5327322ab94711a654d41a5b53be3bf6a3a28a39':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"