| commit | 990c224ffa101c507e59ae5db392b5a5f1171d5f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri Oct 04 18:07:33 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 04 18:07:34 2013 +0000 |
| tree | 5cfe5624c37538337021e72bac2dc914e62abafd | |
| parent | 939def7d917b576b106f76f7cf461a14c3eae1f3 [diff] | |
| parent | 50df961cca4bcabe87cde4a9682c02ca42e26cf5 [diff] |
Merge "Un-deprecate getDhcpInfo" into klp-dev
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;