commit 28bdd1e6bffb8ef3c1c4377ccf1dd9748cf7a58e
author Chalard Jean <jchalard@google.com> Mon May 27 04:33:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 27 04:33:13 2019 -0700
tree 0eafe407d54b783dba50bbbabba7c15337135cef
parent 10ccb3c19f5bd54d7cd656e4dffbbed9a8ad27a6
parent 3c2830e739ce87875a032039b0f35f6d7dff295f

Merge "Reinstate access to a forgotten member" am: 3c2830e739
am: 2f4bd91b99

Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66

core/java/android/net/StaticIpConfiguration.java

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 73813d0..d6deba5 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -22,7 +22,6 @@
 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 @@
 @TestApi
 public final class StaticIpConfiguration implements Parcelable {
     /** @hide */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
+    @UnsupportedAppUsage
     @Nullable
     public LinkAddress ipAddress;
     /** @hide */