Projects >> platform_packages_apps_mms >>56ee740f49cde993ef8de79c30b4da7c14dc76ad

Chunk
Conflicting content 
    public static final String TRANSACTION = "Mms:transaction";
    public static final String APP = "Mms:app";
    public static final String THREAD_CACHE = "Mms:threadcache";
<<<<<<< HEAD
=======
    public static final boolean SEVERE_WARNING = true;                  // Leave this true
    private static final boolean SHOW_SEVERE_WARNING_DIALOG = false;    // Set to false before ship
>>>>>>> 77dc8fc2c1dd7d7dfc0961673a2d65715b9195a5

    private static String prettyArray(String[] array) {
        if (array.length == 0) {
Solution content 
    public static final String TRANSACTION = "Mms:transaction";
    public static final String APP = "Mms:app";
    public static final String THREAD_CACHE = "Mms:threadcache";
    public static final boolean SEVERE_WARNING = true;                  // Leave this true
    private static final boolean SHOW_SEVERE_WARNING_DIALOG = true;    // Set to false before ship

    private static String prettyArray(String[] array) {
        if (array.length == 0) {
File
LogTag.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment