commit 8801199e83ac81b94fbbdc3e140726d0aba41d19
author Aaron Huang <huangaaron@google.com> Thu Nov 28 02:19:08 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 28 02:19:08 2019 -0800
tree 79ff3d55687a067ae7754260d726c2878938cc85
parent 97e58950a8de95b125be1822b03a0d5ab25691f4
parent 54861e8164da444a55757b8b8f61d61b445aac66

Merge "Add IpConfiguration parcelable interface implementation to system API" am: 9ff42e83d1 am: db770e3ed4
am: 54861e8164

Change-Id: I9add4992fbacca4668867abc7a218256805d1bfc

core/java/android/net/IpConfiguration.java

diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java
index 143467b..dddb64d 100644
--- a/core/java/android/net/IpConfiguration.java
+++ b/core/java/android/net/IpConfiguration.java
@@ -191,18 +191,12 @@
                83 * httpProxy.hashCode();
     }
 
-    /**
-     * Implement the Parcelable interface
-     * @hide
-     */
+    /** Implement the Parcelable interface */
     public int describeContents() {
         return 0;
     }
 
-    /**
-     * Implement the Parcelable interface
-     * @hide
-     */
+    /** Implement the Parcelable interface */
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeString(ipAssignment.name());
         dest.writeString(proxySettings.name());