From 4998e952f8261af28311c9a8114ec371d9705d33 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Thu, 12 Jun 2014 12:57:19 -0700
Subject: [PATCH] Make IpPrefix final.

Couldn't resolve a merge conflict, so skipped and make the change this way.

Change-Id: Ib043f660fca2090f0d12a5a707e5e1ad28f76adb
---
 core/java/android/net/IpPrefix.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/net/IpPrefix.java b/core/java/android/net/IpPrefix.java
index dfe03849ae..a14d13f176 100644
--- a/core/java/android/net/IpPrefix.java
+++ b/core/java/android/net/IpPrefix.java
@@ -42,7 +42,7 @@ import java.util.Arrays;
  *
  * Objects of this class are immutable.
  */
-public class IpPrefix implements Parcelable {
+public final class IpPrefix implements Parcelable {
     private final byte[] address;  // network byte order
     private final int prefixLength;
 
@@ -139,7 +139,6 @@ public class IpPrefix implements Parcelable {
 
     /**
      * Implement the Parcelable interface.
-     * @hide
      */
     public int describeContents() {
         return 0;
@@ -147,7 +146,6 @@ public class IpPrefix implements Parcelable {
 
     /**
      * Implement the Parcelable interface.
-     * @hide
      */
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeByteArray(address);
@@ -156,7 +154,6 @@ public class IpPrefix implements Parcelable {
 
     /**
      * Implement the Parcelable interface.
-     * @hide
      */
     public static final Creator<IpPrefix> CREATOR =
             new Creator<IpPrefix>() {