OSDN Git Service

am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where...
authorSatoshi Kataoka <satok@google.com>
Fri, 11 Jan 2013 18:54:31 +0000 (10:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Jan 2013 18:54:31 +0000 (10:54 -0800)
commit9062fd8d554fe609ad6096791e5d69ceab9878fb
treebc8536c4e401455bf286482389147e140e0c966f
parentb70d9df780b50f2aab2ff006e5cbfbd1a43ba332
parent50fc82fdf025bc1fee8f0eb50fa88e4591c8daae
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"
services/java/com/android/server/InputMethodManagerService.java