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

Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-plus-aosp

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base