am 2e23484e: am f9179505: Merge "Un-deprecate getDhcpInfo" into klp-dev

* commit '2e23484eec2321537e843168f76cba4c18b56f95': Un-deprecate getDhcpInfo
2013-10-04 13:34:08 -07:00
parent f859cf43a5 f917950551
commit 772193b76e
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;