Merge "Reinstate access to a forgotten member" am: c73af87b45

am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
This commit is contained in:
Chalard Jean
2019-05-27 04:33:13 -07:00
committed by android-build-merger

View File

@@ -22,7 +22,6 @@ import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.net.shared.InetAddressUtils; import android.net.shared.InetAddressUtils;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -54,7 +53,7 @@ import java.util.Objects;
@TestApi @TestApi
public final class StaticIpConfiguration implements Parcelable { public final class StaticIpConfiguration implements Parcelable {
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) @UnsupportedAppUsage
@Nullable @Nullable
public LinkAddress ipAddress; public LinkAddress ipAddress;
/** @hide */ /** @hide */