Ics

.gitignore

@@ -0,0 +1,2 @@
+
+.DS_Store

cmds/bootanimation/bootanimation_main.cpp

@@ -45,7 +45,7 @@ int main(int argc, char** argv)
 #endif
 
     char value[PROPERTY_VALUE_MAX];
-    property_get("debug.sf.nobootanimation", value, "0");
+    property_get("persist.sys.nobootanimation", value, "0");
     int noBootAnimation = atoi(value);
     LOGI_IF(noBootAnimation,  "boot animation disabled");
     if (!noBootAnimation) {

core/java/android/provider/ContactsContract.java

@@ -750,7 +750,11 @@ protected interface BaseSyncColumns {
         public static final String SYNC3 = "sync3";
         /** Generic column for use by sync adapters. */
         public static final String SYNC4 = "sync4";
+<<<<<<< HEAD
         /** Facebook contacts */
+=======
+         /** Facebook sync */
+>>>>>>> a653394989b691362658984f62af44943a1eba05
         public static final String IS_RESTRICTED = "is_restricted";
     }