From 88a69fc2c0b1334cfd430c2947ff6534b85f3359 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Thu, 3 Oct 2013 16:59:05 -0700
Subject: [PATCH] DO NOT MERGE Un-deprecate getDhcpInfo

Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
---
 core/java/android/net/DhcpInfo.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java
index ab4cd9b9ef..3bede5da50 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;