summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-09-21 18:57:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-21 18:57:00 -0700
commita0c7ec2b5a6940c504ea5af0db46ebc0ec091155 (patch)
treed4cd865806c55b523b99ed3801da5eb1ad7520d2 /core/java/android
parent0d3647dc00849872ec5e18cce8ffe0e6ae02dd47 (diff)
parent90fb9aa93a350d5571a378923c2566f48e44ad3e (diff)
downloadframeworks_base-a0c7ec2b5a6940c504ea5af0db46ebc0ec091155.zip
frameworks_base-a0c7ec2b5a6940c504ea5af0db46ebc0ec091155.tar.gz
frameworks_base-a0c7ec2b5a6940c504ea5af0db46ebc0ec091155.tar.bz2
am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
* commit '90fb9aa93a350d5571a378923c2566f48e44ad3e': Make Bluetooth Health constant public.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/BluetoothProfile.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index 58b3868..f7ccfbd 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -66,7 +66,6 @@ public interface BluetoothProfile {
/**
* Health Profile
- * @hide
*/
public static final int HEALTH = 3;