summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2016-05-19 04:12:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-19 04:12:40 +0000
commitc21f84dddbe8144bb3d392b3b91c6df5f48aed42 (patch)
tree299207b9f2079c792245617fe3c21f44ae36d5b0 /core/java/android
parent8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b (diff)
parentacda32c35fc6a30ce11abfddb26ec5052de063f4 (diff)
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/StaticIpConfiguration.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 7f1b1791b5d3..58b1b88d8976 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -131,7 +131,7 @@ public class StaticIpConfiguration implements Parcelable {
str.append(" ").append(dnsServer.getHostAddress());
}
- str.append(" ] Domains");
+ str.append(" ] Domains ");
if (domains != null) str.append(domains);
return str.toString();
}