tree bc8536c4e401455bf286482389147e140e0c966f
parent b70d9df780b50f2aab2ff006e5cbfbd1a43ba332
parent 50fc82fdf025bc1fee8f0eb50fa88e4591c8daae
author Satoshi Kataoka <satok@google.com> 1357930471 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930471 -0800

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

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