am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair

Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'

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

core/java/android/content/Intent.java

@@ -1678,6 +1678,7 @@ public class Intent implements Parcelable {
      * <ul>
      *   <li><em>state</em> - 0 for unplugged, 1 for plugged. </li>
      *   <li><em>name</em> - Headset type, human readable string </li>
+     *   <li><em>microphone</em> - 1 if headset has a microphone, 0 otherwise </li>
      * </ul>
      * </ul>
      */