am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair

Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp

* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
  Fix code example in Parcelable javadoc