summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/Context.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-04-24 15:13:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-24 15:13:03 -0700
commitc1da08f1aea42d958c0dd245f1d58345e43eb323 (patch)
treea595b6ae63bf197f5bc5bdc99c1868b31d9970e9 /core/java/android/content/Context.java
parente29ccb0d678c712c71bf73f1c66626feff4fa346 (diff)
parent60309fc7bb95c9b3fc3e0ed60aa1eeb35bd13a68 (diff)
downloadframeworks_base-c1da08f1aea42d958c0dd245f1d58345e43eb323.zip
frameworks_base-c1da08f1aea42d958c0dd245f1d58345e43eb323.tar.gz
frameworks_base-c1da08f1aea42d958c0dd245f1d58345e43eb323.tar.bz2
Merge "Expose Context.NSD_SERVICE"
Diffstat (limited to 'core/java/android/content/Context.java')
-rw-r--r--core/java/android/content/Context.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 381daa3..4c169d3 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1770,12 +1770,11 @@ public abstract class Context {
/**
* Use with {@link #getSystemService} to retrieve a {@link
- * android.net.NsdManager} for handling management of network service
+ * android.net.nsd.NsdManager} for handling management of network service
* discovery
*
- * @hide
* @see #getSystemService
- * @see android.net.NsdManager
+ * @see android.net.nsd.NsdManager
*/
public static final String NSD_SERVICE = "servicediscovery";