commit 51ff2b0d9e50b7c4a3031676bf42bf551e96b19e
author Robert Greenwalt <rgreenwalt@google.com> Fri Oct 04 13:34:08 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 04 13:34:08 2013 -0700
tree 5cfe5624c37538337021e72bac2dc914e62abafd
parent 978c8728f55bd4d5b8ed298eda30d30658ebdd19
parent 990c224ffa101c507e59ae5db392b5a5f1171d5f

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

* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo

core/java/android/net/DhcpInfo.java

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 @@
 
 /**
  * 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;