am 98029d9d: am ee16b2c2: am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields
am 98029d9d: am ee16b2c2: am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields

* commit '98029d9dcb596fdb45ccf11c7a5075137af75628':
  Keep Parcelable CREATOR fields

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build