am 90fb9aa: Merge "Make Bluetooth Health constant public." into ics-factoryrom

* commit '90fb9aa93a350d5571a378923c2566f48e44ad3e':
  Make Bluetooth Health constant public.

Author: Jaikumar Ganesh

api/14.txt

@@ -4567,6 +4567,7 @@ package android.bluetooth {
     field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
     field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
     field public static final int HEADSET = 1; // 0x1
+    field public static final int HEALTH = 3; // 0x3
     field public static final int STATE_CONNECTED = 2; // 0x2
     field public static final int STATE_CONNECTING = 1; // 0x1
     field public static final int STATE_DISCONNECTED = 0; // 0x0

api/current.txt

@@ -4567,6 +4567,7 @@ package android.bluetooth {
     field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
     field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
     field public static final int HEADSET = 1; // 0x1
+    field public static final int HEALTH = 3; // 0x3
     field public static final int STATE_CONNECTED = 2; // 0x2
     field public static final int STATE_CONNECTING = 1; // 0x1
     field public static final int STATE_DISCONNECTED = 0; // 0x0

core/java/android/bluetooth/BluetoothProfile.java

@@ -66,7 +66,6 @@ public interface BluetoothProfile {
 
     /**
      * Health Profile
-     * @hide
      */
     public static final int HEALTH = 3;