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

am: 54861e8164

Change-Id: I9add4992fbacca4668867abc7a218256805d1bfc

core/java/android/net/IpConfiguration.java

@@ -191,18 +191,12 @@ public final class IpConfiguration implements Parcelable {
                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());