Merge "Align the Kotlin sample code for Parcelable with Java"

core/java/android/os/Parcelable.java

@@ -44,16 +44,13 @@ import java.lang.annotation.RetentionPolicy;
  *         out.writeInt(mData)
  *     }
  *
- *     companion object {
- *         val CREATOR: Parcelable.Creator<MyParcelable?>
- *                 = object : Parcelable.Creator<MyParcelable?> {
- *             override fun createFromParcel(`in`: Parcel): MyParcelable? {
- *                 return MyParcelable(`in`)
- *             }
+ *     companion object CREATOR: Parcelable.Creator<MyParcelable?> {
+ *         override fun createFromParcel(`in`: Parcel): MyParcelable? {
+ *             return MyParcelable(`in`)
+ *         }
  *
- *             override fun newArray(size: Int): Array<MyParcelable?> {
- *                 return arrayOfNulls(size)
- *             }
+ *         override fun newArray(size: Int): Array<MyParcelable?> {
+ *             return arrayOfNulls(size)
  *         }
  *     }
  * }