am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo

* commit '88a69fc2c0b1334cfd430c2947ff6534b85f3359': DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:17:18 -07:00
parent 0f1ac4682b 88a69fc2c0
commit ff23ab37b9
1 changed files with 0 additions and 1 deletions
--- 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;