Merge "Reinstate access to a forgotten member" am: ab6ab9e4d4 am: 2f4bd91b99 am: 41bd3c57b4 (dfa732f5) · Commits · e / os / android_frameworks_base

core/java/android/net/StaticIpConfiguration.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.net.shared.InetAddressUtils;
		import android.os.Build;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -54,7 +53,7 @@ import java.util.Objects;
		@TestApi
		public final class StaticIpConfiguration implements Parcelable {
		/** @hide */
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
		@UnsupportedAppUsage
		@Nullable
		public LinkAddress ipAddress;
		/** @hide */