am eb96a3c3: Merge change 25894 into eclair
am eb96a3c3: Merge change 25894 into eclair

Merge commit 'eb96a3c3d3707167c9571f7dd7729782e747518e' into eclair-plus-aosp

* commit 'eb96a3c3d3707167c9571f7dd7729782e747518e':
  Adding CONTENT_TYPE to CommonDataKinds.Email

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