Projects >> platform_frameworks_base >>ea182704b60551a9bd7760aa9d206ca7a7e407b8

Chunk
Conflicting content 
                //Capability.LAYOUT_ONLY, // disable to run on ADT 10.0 which doesn't include this.
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
<<<<<<< HEAD
                Capability.PLAY_ANIMATION,
                Capability.ANIMATED_VIEW_MANIPULATION,
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO);

=======
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO);
>>>>>>> 041fd74beade4e95cff6157af9dadbf9a99b7fcf

        BridgeAssetManager.initSystem();
Solution content 
                //Capability.LAYOUT_ONLY, // disable to run on ADT 10.0 which doesn't include this.
                Capability.EMBEDDED_LAYOUT,
                Capability.VIEW_MANIPULATION,
                Capability.PLAY_ANIMATION,
                Capability.ANIMATED_VIEW_MANIPULATION,
                Capability.ADAPTER_BINDING,
                Capability.EXTENDED_VIEWINFO);


        BridgeAssetManager.initSystem();
File
Bridge.java
Developer's decision
Version 1
Kind of conflict
Other