Merge change 20126

* changes:
  Removing SyncColumns from Contact - they were put there by accident.
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index a7c76a0..b24bab3 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -230,7 +230,7 @@
      * of raw contact representing the same person.
      */
     public static class Contacts implements BaseColumns, ContactsColumns,
-            ContactOptionsColumns, SyncColumns {
+            ContactOptionsColumns {
         /**
          * This utility class cannot be instantiated
          */