commit | 9371747e752236727be58149a8d04248860c134f | [log] [tgz] |
---|---|---|
author | Satoshi Kataoka <satok@google.com> | Sat Nov 17 21:59:18 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 17 21:59:18 2012 -0800 |
tree | b7bc84c3ee50ee2e05cdfa3c6fdd970197ba02b1 | |
parent | 3e932c45c6ed698a44b73bc1b06a1bca07205e14 [diff] | |
parent | 0e1c092ab0ee0f2f499dba2bc51223e106f51964 [diff] |
am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev * commit '0e1c092ab0ee0f2f499dba2bc51223e106f51964': Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected