am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev

* commit 'f3f1a3709306454c0ca562e2c7262d4889dd0071':
  Un-deprecate getDhcpInfo

api/current.txt

@@ -14109,7 +14109,7 @@ package android.net {
     method public int getUid();
   }
 
-  public deprecated class DhcpInfo implements android.os.Parcelable {
+  public class DhcpInfo implements android.os.Parcelable {
     ctor public DhcpInfo();
     method public int describeContents();
     method public void writeToParcel(android.os.Parcel, int);
@@ -15021,7 +15021,7 @@ package android.net.wifi {
     method public boolean enableNetwork(int, boolean);
     method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
     method public android.net.wifi.WifiInfo getConnectionInfo();
-    method public deprecated android.net.DhcpInfo getDhcpInfo();
+    method public android.net.DhcpInfo getDhcpInfo();
     method public java.util.List<android.net.wifi.ScanResult> getScanResults();
     method public int getWifiState();
     method public boolean isScanAlwaysAvailable();

core/java/android/net/DhcpInfo.java

@@ -22,7 +22,6 @@ import java.net.InetAddress;
 
 /**
  * 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;

wifi/java/android/net/wifi/WifiManager.java

@@ -988,7 +988,6 @@ public class WifiManager {
      * Return the DHCP-assigned addresses from the last successful DHCP request,
      * if any.
      * @return the DHCP information
-     * @deprecated - use ConnectivityManager.getLinkProperties instead.  TODO - remove 11/2013
      */
     public DhcpInfo getDhcpInfo() {
         try {