tree 1b244f60e1a10434c24b4bee8838f3bf8e9287d6
parent a8d7b52c88ec0dea889affeaa9311b6f7ae43538
parent 7ad7b2c437d10fb8e7221e6e28aa247217f93681
author satok <satok@google.com> 1355941485 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355941485 -0800

am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled

* commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled