Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index 6bf3fab..cbce22c 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -131,18 +131,6 @@
     public static final int HEADSET_CLIENT = 16;
 
     /**
-     * HID Profile
-     * @hide
-     */
-    public static final int HID = 17;
-
-    /**
-     * HDP Profile
-     * @hide
-     */
-    public static final int HDP = 18;
-
-    /**
      * Default priority for devices that we try to auto-connect to and
      * and allow incoming connections for the profile
      * @hide