Projects >> platform_frameworks_base >>8bfae2e4a45485ea7252fd15781a1614007a4b5e

Chunk
Conflicting content 
        }
>>>>>>> e7e697145f8fa21eb5e4a9636a27b1a99fd0997e
            return null;
        }

        if (rawss == null) {
<<<<<<< HEAD
            Log.w(TAG, "Failure taking screenshot for (" + dw + "x" + dh
                    + ") to layer " + maxLayer);
=======
Solution content 
        }

        if (rawss == null) {
            Log.w(TAG, "Failure taking screenshot for (" + dw + "x" + dh
                    + ") to layer " + maxLayer);
            return null;
        }
File
WindowManagerService.java
Developer's decision
Version 1
Kind of conflict
Method invocation