am b06c9a8c: Merge change 26579 into eclair
am b06c9a8c: Merge change 26579 into eclair

Merge commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656' into eclair-plus-aosp

* commit 'b06c9a8c8e59067edd3c6b5af574ff382a4ef656':
  add definition for Mms.TempStorage content uri and filename.

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