summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2011-09-21 17:44:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-21 17:44:32 -0700
commit90fb9aa93a350d5571a378923c2566f48e44ad3e (patch)
tree09920b0b013d6d940227bf07e9de6ea1cc7d461e /core
parent9c711282ad234e104c34eb4408d85fc1bb149ded (diff)
parentfd966a124f10448298aac79c4bb6cf8eb877277a (diff)
downloadframeworks_base-90fb9aa93a350d5571a378923c2566f48e44ad3e.zip
frameworks_base-90fb9aa93a350d5571a378923c2566f48e44ad3e.tar.gz
frameworks_base-90fb9aa93a350d5571a378923c2566f48e44ad3e.tar.bz2
Merge "Make Bluetooth Health constant public." into ics-factoryrom
Diffstat (limited to 'core')
-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;