summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/nsd
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-04-17 11:40:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-17 11:40:03 -0700
commit120505424098538ed9dfb97bf29b1dd143715259 (patch)
tree013a25dbb9eb3e4ef197fb79ce5a2423b19cb845 /core/java/android/net/nsd
parent2e3dec5aebb2020a9107e847659af5aaf7215f66 (diff)
parent8bf825f48fde77cb2feb8720aac17093581bb085 (diff)
downloadframeworks_base-120505424098538ed9dfb97bf29b1dd143715259.zip
frameworks_base-120505424098538ed9dfb97bf29b1dd143715259.tar.gz
frameworks_base-120505424098538ed9dfb97bf29b1dd143715259.tar.bz2
Merge "Open p2p pre-association service discovery API"
Diffstat (limited to 'core/java/android/net/nsd')
-rw-r--r--core/java/android/net/nsd/DnsSdTxtRecord.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/net/nsd/DnsSdTxtRecord.java b/core/java/android/net/nsd/DnsSdTxtRecord.java
index 952e02f..ccb9a91 100644
--- a/core/java/android/net/nsd/DnsSdTxtRecord.java
+++ b/core/java/android/net/nsd/DnsSdTxtRecord.java
@@ -37,7 +37,6 @@ import java.util.Arrays;
* The DnsSdTxtRecord object stores the entire TXT data as a single byte array, traversing it
* as need be to implement its various methods.
*
- * @hide
*/
public class DnsSdTxtRecord implements Parcelable {
private static final byte mSeperator = '=';