summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-10-04 14:17:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 14:17:18 -0700
commit5ab9af410e1ba572e8ac0577c2acb5324b65d66c (patch)
tree117c24d18820a17151c60175b02b9c33c8ee73c4 /core/java
parent8098bfac6a08d59697e308a524f96f69e482ecf7 (diff)
parentf76b5383cd568dcfafb6819449b846ff76072c44 (diff)
downloadframeworks_base-5ab9af410e1ba572e8ac0577c2acb5324b65d66c.zip
frameworks_base-5ab9af410e1ba572e8ac0577c2acb5324b65d66c.tar.gz
frameworks_base-5ab9af410e1ba572e8ac0577c2acb5324b65d66c.tar.bz2
am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'f76b5383cd568dcfafb6819449b846ff76072c44': DO NOT MERGE Un-deprecate getDhcpInfo
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/DhcpInfo.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java
index ab4cd9b..3bede5d 100644
--- a/core/java/android/net/DhcpInfo.java
+++ b/core/java/android/net/DhcpInfo.java
@@ -22,7 +22,6 @@ import java.net.InetAddress;
/**
* A simple object for retrieving the results of a DHCP request.
- * @deprecated - use LinkProperties - To be removed 11/2014
*/
public class DhcpInfo implements Parcelable {
public int ipAddress;