Merge change Icaf932d0 into eclair

* changes:
  Fix code example in Parcelable javadoc