Merge commit 'eb96a3c3d3707167c9571f7dd7729782e747518e' into eclair-plus-aosp * commit 'eb96a3c3d3707167c9571f7dd7729782e747518e': Adding CONTENT_TYPE to CommonDataKinds.Email
Merge commit 'eb96a3c3d3707167c9571f7dd7729782e747518e' into eclair-plus-aosp * commit 'eb96a3c3d3707167c9571f7dd7729782e747518e': Adding CONTENT_TYPE to CommonDataKinds.Email