am 1025b50f: Merge "Remove ContactsTest GMS Dependencies" into froyo

Merge commit '1025b50f4070b4e132b8aa99ad0e3a930518341e' into gingerbread

* commit '1025b50f4070b4e132b8aa99ad0e3a930518341e':
  Remove ContactsTest GMS Dependencies
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
index 0496385..2b0786c 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
@@ -869,7 +869,6 @@
      * Test case for the behavior of the ContactsProvider's groupmembership table
      * It does not test any APIs in android.provider.Contacts.java
      */
-    @KnownFailure(value="bug 2258907, needs investigation")
     public void testGroupMembershipTable() {
         final String[] GROUP_MEMBERSHIP_PROJECTION = new String[] {
                 GroupMembership._ID, GroupMembership.PERSON_ID,
@@ -909,8 +908,6 @@
             assertTrue(cursor.moveToNext());
             assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
             assertEquals(groupId1, cursor.getInt(GROUP_ID_INDEX));
-            assertNull(cursor.getString(GROUP_SYNC_ACCOUNT_INDEX));
-            assertNull(cursor.getString(GROUP_SYNC_ID_INDEX));
             int id = cursor.getInt(ID_INDEX);
             cursor.close();