AI 143308: am: CL 143159 am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.
  Added a new WITH_EMAIL_OR_IM_FILTER_URI to find people with a given string as either an E-mail or IM address.  This cleans up the original code, and lets us handle duplicates when there are multiple ContactMethod matches for a single person.  (We don't get GROUP BY through the ContentProvider interface.)
  In ContactsListActivity we don't show possibly-incorrect labels when in MODE_QUERY_PICK_TO_VIEW, as any labels and values would be identical.  (The people appearing in that list are there because their ContactMethod matches the query.)
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143308
1 file changed