am d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1

* commit 'd8f5e6badb0dc11055508b83f20e48c82a7058bd':
  Allow ContactsProvider to remove dulicates

core/java/android/provider/ContactsContract.java

@@ -186,6 +186,16 @@ public final class ContactsContract {
      */
     public static final String DEFERRED_SNIPPETING_QUERY = "deferred_snippeting_query";
 
+    /**
+     * A boolean parameter for {@link CommonDataKinds.Phone#CONTENT_URI},
+     * {@link CommonDataKinds.Email#CONTENT_URI}, and
+     * {@link CommonDataKinds.StructuredPostal#CONTENT_URI}.
+     * This enables a content provider to remove duplicate entries in results.
+     *
+     * @hide
+     */
+    public static final String REMOVE_DUPLICATE_ENTRIES = "remove_duplicate_entries";
+
     /**
      * <p>
      * API for obtaining a pre-authorized version of a URI that normally requires special