am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each Parcelable message."

* commit '1d4b8b9fc9950152a1b235dfc83cf613a3b18ca4':
  Generate a CREATOR for each Parcelable message.

1 files changed, 1 insertions, 16 deletions

diff --git a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
index b07f1d6..83f973d 100644
--- a/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
+++ b/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java
@@ -40,21 +40,6 @@ import com.google.protobuf.nano.MessageNano;
  */
 public abstract class ParcelableMessageNano extends MessageNano implements Parcelable {
 
-    // Used by Parcelable
-    @SuppressWarnings("unused")
-    public static final Creator<ParcelableMessageNano> CREATOR =
-            new Creator<ParcelableMessageNano>() {
-        @Override
-        public ParcelableMessageNano createFromParcel(Parcel in) {
-            return ParcelingUtil.createFromParcel(in);
-        }
-
-        @Override
-        public ParcelableMessageNano[] newArray(int size) {
-            return new ParcelableMessageNano[size];
-        }
-    };
-
     @Override
     public int describeContents() {
         return 0;
@@ -62,6 +47,6 @@ public abstract class ParcelableMessageNano extends MessageNano implements Parce
 
     @Override
     public void writeToParcel(Parcel out, int flags) {
-        ParcelingUtil.writeToParcel(getClass(), this, out);
+        ParcelableMessageNanoCreator.writeToParcel(getClass(), this, out);
     }
 }