commit | 1ee199a4c6dba6153c49d3d24cce39acb5439a4f | [log] [tgz] |
---|---|---|
author | Satoshi Kataoka <satok@google.com> | Sat Nov 17 22:01:57 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 17 22:01:57 2012 -0800 |
tree | 2e25b16073418f0f6adac1036e92c43a23356a86 | |
parent | ee16821464479fd71e5c7090f135f0ae60c45b75 [diff] | |
parent | 9371747e752236727be58149a8d04248860c134f [diff] |
am 9371747e: 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 '9371747e752236727be58149a8d04248860c134f': Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected