Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 470ee27a authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Reinstate access to a forgotten member" am: ab6ab9e4 am: 2f4bd91b

am: 41bd3c57

Change-Id: If2cce67f40381e3edc8d43a263ea0e5be4af39d0
parents e44afba7 41bd3c57
Loading
Loading
Loading
Loading
+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 */