commit 64e02e64341d33edda1d0ec28d5394c8d0d6509e
author Robert Greenwalt <rgreenwalt@google.com> Fri Oct 04 14:17:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 04 14:17:18 2013 -0700
tree 1a62c1892acc579dd068e7937ec24970767f9983
parent 202965ca2a6cd02840581813f2b60660c71baf60
parent 5a1519f8d1ff7e9623a347ca138ca925e07844cd

am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo

* commit '5a1519f8d1ff7e9623a347ca138ca925e07844cd':
  DO NOT MERGE 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;