commit 4f15276a26f8f11636888e6e10d2577472d4505e
author Robert Greenwalt <rgreenwalt@google.com> Sun Oct 06 17:03:59 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 06 17:03:59 2013 -0700
tree 5be473cd8eae0073e9078a5e8bb1c0b35e9a8a79
parent fea09d861190b9c115cbb2518e1d9c465eb2256e
parent ff23ab37b9d2318477247e87d288faad9d15e002

am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo

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