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

Merge commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4'

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