Projects >> platform_packages_apps_Settings >>2518c6065b23ebe4564b9e9f55f329b1e4d4372c

Chunk
Conflicting content 
        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
<<<<<<< HEAD
        setValueSummary(KEY_BUILD_DATE, "ro.build.date");
=======
        findPreference(KEY_BUILD_NUMBER).setEnabled(true);
>>>>>>> 79bf08d246aa24b5d5330630c66b71b9f2f57228
        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());

        if (!SELinux.isSELinuxEnabled()) {
Solution content 
        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
        setValueSummary(KEY_BUILD_DATE, "ro.build.date");
        findPreference(KEY_BUILD_NUMBER).setEnabled(true);
        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());

        if (!SELinux.isSELinuxEnabled()) {
File
DeviceInfoSettings.java
Developer's decision
Concatenation
Kind of conflict
Method invocation