From 75267c4ee9c5480de5c9538f02c61ad4d9cd5ef0 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Fri, 19 Apr 2013 09:31:24 -0700
Subject: [PATCH] Remove STOPSHIP and defer removal.

bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
---
 core/java/android/net/DhcpInfo.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java
index 2b359ebc11..ab4cd9b9ef 100644
--- a/core/java/android/net/DhcpInfo.java
+++ b/core/java/android/net/DhcpInfo.java
@@ -22,8 +22,7 @@ import java.net.InetAddress;
 
 /**
  * A simple object for retrieving the results of a DHCP request.
- * @deprecated - use LinkProperties - To be removed 11/2013
- * STOPSHIP - make sure we expose LinkProperties through ConnectivityManager
+ * @deprecated - use LinkProperties - To be removed 11/2014
  */
 public class DhcpInfo implements Parcelable {
     public int ipAddress;