am 2bb53754: Merge change Icaf932d0 into eclair

Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc

1 files changed, 8 insertions, 4 deletions

diff --git a/core/java/android/os/Parcelable.java b/core/java/android/os/Parcelable.java
index aee1e0b..0a4b60f 100644
--- a/core/java/android/os/Parcelable.java
+++ b/core/java/android/os/Parcelable.java
@@ -28,13 +28,17 @@ package android.os;
  * <pre>
  * public class MyParcelable implements Parcelable {
  *     private int mData;
- *     
+ *
+ *     public int describeContents() {
+ *         return 0;
+ *     }
+ *
  *     public void writeToParcel(Parcel out, int flags) {
  *         out.writeInt(mData);
  *     }
  *
- *     public static final Parcelable.Creator<MyParcelable> CREATOR
- *             = new Parcelable.Creator<MyParcelable>() {
+ *     public static final Parcelable.Creator&lt;MyParcelable&gt; CREATOR
+ *             = new Parcelable.Creator&lt;MyParcelable&gt;() {
  *         public MyParcelable createFromParcel(Parcel in) {
  *             return new MyParcelable(in);
  *         }
@@ -42,7 +46,7 @@ package android.os;
  *         public MyParcelable[] newArray(int size) {
  *             return new MyParcelable[size];
  *         }
- *     }
+ *     };
  *     
  *     private MyParcelable(Parcel in) {
  *         mData = in.readInt();