Projects >> android_frameworks_base >>b052ecaa7e6ce40cec43efe5353b4bb12079aa55

Chunk
Conflicting content 
                Capability.UNBOUND_RENDERING,
                Capability.CUSTOM_BACKGROUND_COLOR,
                Capability.RENDER,
<<<<<<< HEAD
=======
                Capability.LAYOUT_ONLY,
>>>>>>> 86e43034a6834a274efefaabefc0dbdd1bbc8d35
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
                Capability.PLAY_ANIMATION,
Solution content 
                Capability.UNBOUND_RENDERING,
                Capability.CUSTOM_BACKGROUND_COLOR,
                Capability.RENDER,
                Capability.LAYOUT_ONLY,
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
                Capability.PLAY_ANIMATION,
File
Bridge.java
Developer's decision
Version 2
Kind of conflict
Other