Projects >> android_frameworks_base >>9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12

Chunk
Conflicting content 

            return sManager.addNewDelegate(newDelegate);
        }
<<<<<<< HEAD
=======

        // create a new Canvas_Delegate and return its new native int.
        Canvas_Delegate newDelegate = new Canvas_Delegate();

        return sManager.addNewDelegate(newDelegate);
    }
>>>>>>> b7b877a45f469336703844a928482e6438442567
        // create a new Canvas_Delegate and return its new native int.
        Canvas_Delegate newDelegate = new Canvas_Delegate();
Solution content 
            return sManager.addNewDelegate(newDelegate);
        }

        // create a new Canvas_Delegate and return its new native int.
        Canvas_Delegate newDelegate = new Canvas_Delegate();
File
Canvas_Delegate.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Return statement
Variable