summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Blake Lawson <blaws@google.com> 2018-08-23 21:27:11 -0700
committer android-build-merger <android-build-merger@google.com> 2018-08-23 21:27:11 -0700
commit0cf90160c6948df621b15dd07e007d69a7ad1a1b (patch)
tree6787081786e11c4462ed450952f6315488383cfc
parent6d7e402a508daec4da4296f21dc35e310aed22db (diff)
parent4d0997093e738b7c192a17d2347f6b395b4f5e61 (diff)
Merge "Fix typo in IpConfiguration comment" am: 7b7e05459f am: a42857e3a4
am: 4d0997093e Change-Id: I58b8e7c793d73ea53f11d66bc6f709d0c4f0c5aa
-rw-r--r--core/java/android/net/IpConfiguration.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java
index 7543920e363f..3319f33878c1 100644
--- a/core/java/android/net/IpConfiguration.java
+++ b/core/java/android/net/IpConfiguration.java
@@ -35,7 +35,7 @@ public class IpConfiguration implements Parcelable {
* with staticIpConfiguration */
@UnsupportedAppUsage
STATIC,
- /* Use dynamically configured IP settigns */
+ /* Use dynamically configured IP settings */
DHCP,
/* no IP details are assigned, this is used to indicate
* that any existing IP settings should be retained */