tree 8b81607457aaee8101962f34a3cdf99a7d99240f
parent 6ff270fd854d7c62f857998446fccb803004f1c3
parent b3c49982840c05a5392d53efe97253c04fc59ef0
author Android (Google) Code Review <android-gerrit@google.com> 1251835765 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251835765 -0700

Merge change 23461 into eclair

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