am b1d07947: am 163be61c: Merge change 25412 into eclair
am b1d07947: am 163be61c: Merge change 25412 into eclair

Merge commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e'

* commit 'b1d07947050f9b1e703afb6bf0c1b92f24905c0e':
  Make ParcelUuid helper functions consistent.

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