Projects >> android-frameworks-base >>727cec02daa66b5e984aff277185d503fabe5d51

Chunk
Conflicting content 
            for (int i=0; i>>>>>> 69e398bd14fc909bb5f854c435fd210ae0974748
                    continue;
                }
                if (DEBUG_VISIBILITY) {
Solution content 
            for (int i=0; i
File
WindowManagerService.java
Developer's decision
Manual
Kind of conflict
Attribute
Variable