Projects >> platform_packages_apps_mms >>d40a7d8fa341ecfda9df920c651cacee1308247a

Chunk
Conflicting content 
            Conversation conv = Conversation.from(this, cursor);
            long tid = conv.getThreadId();

<<<<<<< HEAD
            if (LogTag.VERBOSE) {
                Log.d(TAG, "onListItemClick: pos=" + position + ", view=" + v + ", tid=" + tid);
            }

=======
>>>>>>> 4f4bdc23983376a430044e55304cbad95262ecde
            openThread(tid);
        }
    }
Solution content 
            Conversation conv = Conversation.from(this, cursor);
            long tid = conv.getThreadId();

            if (LogTag.VERBOSE) {
                Log.d(TAG, "onListItemClick: pos=" + position + ", view=" + v + ", tid=" + tid);
            }

            openThread(tid);
        }
    }
File
ConversationList.java
Developer's decision
Version 1
Kind of conflict
If statement