Merge "Fix typo in IpConfiguration comment" am: 502e5b1aa2 am: 984d4edfa4

am: 3034e8c321 Change-Id: I58b8e7c793d73ea53f11d66bc6f709d0c4f0c5aa
2018-08-23 21:27:11 -07:00
parent d81a121dd1 3034e8c321
commit 111dd467b3
1 changed files with 1 additions and 1 deletions
--- 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 */