Projects >> platform_frameworks_base >>0da89b76402816dade084166a97b1d352ae1f78b

Chunk
Conflicting content 
     */
    public static String getTimeFormatString(Context context, int userHandle) {
        LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);
<<<<<<< HEAD
        return is24HourFormat(context) ? d.timeFormat_Hm : d.timeFormat_hm;
=======
        return is24HourFormat(context, userHandle) ? d.timeFormat24 : d.timeFormat12;
>>>>>>> f0fc23a14170cdd37d4ae641293d6e87b846680a
    }

    /**
Solution content 
     */
    public static String getTimeFormatString(Context context, int userHandle) {
        LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);
        return is24HourFormat(context, userHandle) ? d.timeFormat_Hm : d.timeFormat_hm;
    }

    /**
File
DateFormat.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable