tree b90fd98ef4b877f4ce0a40b4227ad5e717134b2c
parent e007c0e8bc306f13149e6e099753cd110da1ec8c
parent 15451bd7afedb98a84574f69086936f883371c83
author Satoshi Kataoka <satok@google.com> 1353217982 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1353217990 -0800

Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev