Projects >> platform_frameworks_base >>9ca6d71c52fcfab730b65bb01ff6bd47232c8599

Chunk
Conflicting content 
            if (column.equals(COLUMN_MEDIA_TYPE)) {
                return getUnderlyingString(Downloads.COLUMN_MIME_TYPE);
            }
<<<<<<< HEAD
            if (column.equals(COLUMN_LOCAL_FILENAME)) {
                return getUnderlyingString(Downloads.Impl._DATA);
=======
            if (column.equals(COLUMN_MEDIAPROVIDER_URI)) {
                return getUnderlyingString(Downloads.Impl.COLUMN_MEDIAPROVIDER_URI);
>>>>>>> c6bf3eaab40f90e4e4db4dea9fdca8740b00606a
            }

            assert column.equals(COLUMN_LOCAL_URI);
Solution content 
            if (column.equals(COLUMN_MEDIA_TYPE)) {
                return getUnderlyingString(Downloads.COLUMN_MIME_TYPE);
            }
            if (column.equals(COLUMN_LOCAL_FILENAME)) {
                return getUnderlyingString(Downloads.Impl._DATA);
            }
            if (column.equals(COLUMN_MEDIAPROVIDER_URI)) {
                return getUnderlyingString(Downloads.Impl.COLUMN_MEDIAPROVIDER_URI);
            }

            assert column.equals(COLUMN_LOCAL_URI);
File
DownloadManager.java
Developer's decision
Concatenation
Kind of conflict
If statement
Method invocation
Return statement