tree deda93cfee3b09e28c7fbd2e0de76fd479c819da
parent 2058977493230bec659e94756b1220b80fa7874a
parent 1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54
author Eric Laurent <elaurent@google.com> 1258094991 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258094991 -0800

am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.