Projects >> android-frameworks-base-with-remote-control-service >>2eac99ccbcdcc91b69c04ea2eb03f4cba961c17c

Chunk
Conflicting content 
    private static final String TABLE_FAVORITES = "favorites";
    private static final String TABLE_OLD_FAVORITES = "old_favorites";

<<<<<<< HEAD
    protected DatabaseHelper mOpenHelper;
=======
    private DatabaseHelper mOpenHelper;
    
    private BackupManager mBackupManager;
>>>>>>> d6fe243c1c6d5e994cacede8110eef736767bd7f

    /**
     * Decode a content URL into the table, projection, and arguments
Solution content 
    private static final String TABLE_FAVORITES = "favorites";
    private static final String TABLE_OLD_FAVORITES = "old_favorites";

    protected DatabaseHelper mOpenHelper;
    private BackupManager mBackupManager;

    /**
     * Decode a content URL into the table, projection, and arguments
File
SettingsProvider.java
Developer's decision
Combination
Kind of conflict
Attribute