commit ff23ab37b9d2318477247e87d288faad9d15e002
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 0f1ac4682b0719b2cc900ea41a86a1c55ff50a75
parent 88a69fc2c0b1334cfd430c2947ff6534b85f3359

am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo

* commit '88a69fc2c0b1334cfd430c2947ff6534b85f3359':
  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;