am ac7d821d: am 394c92ef: Merge change 23461 into eclair
am ac7d821d: am 394c92ef: Merge change 23461 into eclair

Merge commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d'

* commit 'ac7d821d1aa9646ad977e450f57ec291df9e023d':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider

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