am 7cd40294: Merge change I2cb78a66 into eclair-mr2
am 7cd40294: Merge change I2cb78a66 into eclair-mr2

Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp

* commit '7cd4029473431c56100e52f631b9733829dc3171':
  Add convenience function to MediaStore to move a playlist item

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