resolved conflicts for merge of f6bb01b0 to master

services/java/com/android/server/FallbackCheckinService.java

@@ -34,21 +34,11 @@ import com.google.android.net.ParentalControlState;
 public final class FallbackCheckinService extends ICheckinService.Stub {
     static final String TAG = "FallbackCheckinService";
     final Context mContext;
-    
+
     public FallbackCheckinService(Context context) {
         mContext = context;
     }
 
-    public boolean checkin() {
-        return false;  // failure, because not implemented
-    }
-
-    public void reportCrashSync(byte[] crashData) {
-    }
-
-    public void reportCrashAsync(byte[] crashData) {
-    }
-
     public void masterClear() {
         if (mContext.checkCallingOrSelfPermission("android.permission.MASTER_CLEAR") !=
                 PackageManager.PERMISSION_GRANTED) {