Projects >> android-frameworks-base >>3c193a4a8d748faf420988250aabda0145e74bf7

Chunk
Conflicting content 
     */
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
    public static final String ACTION_POWER_DISCONNECTED =
<<<<<<< HEAD
            "android.intent.action.ACTION_POWER_DISCONNECTED";
=======
            "android.intent.action.ACTION_POWER_DISCONNECTED";    
>>>>>>> be8e36e32b9cb2bb37e28e4c0d414ee0e46c84a2
    /**
     * Broadcast Action:  Device is shutting down.
     * This is broadcast when the device is being shut down (completely turned
Solution content 
     */
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
    public static final String ACTION_POWER_DISCONNECTED =
            "android.intent.action.ACTION_POWER_DISCONNECTED";
    /**
     * Broadcast Action:  Device is shutting down.
     * This is broadcast when the device is being shut down (completely turned
File
Intent.java
Developer's decision
Version 1
Kind of conflict
Other