Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: bd4b5327db

am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
This commit is contained in:
Erik Kline
2016-05-19 04:24:16 +00:00
committed by android-build-merger

View File

@@ -131,7 +131,7 @@ public class StaticIpConfiguration implements Parcelable {
str.append(" ").append(dnsServer.getHostAddress()); str.append(" ").append(dnsServer.getHostAddress());
} }
str.append(" ] Domains"); str.append(" ] Domains ");
if (domains != null) str.append(domains); if (domains != null) str.append(domains);
return str.toString(); return str.toString();
} }