Projects >> android-frameworks-base-with-screenshot-tweaks >>bd80a12cba480a0dbb2e9073f35c758d8b396b94

Chunk
Conflicting content 
    
            mStopped = true;
        }
<<<<<<< HEAD
=======
        mResumed = false;

        // Check for Activity leaks, if enabled.
        StrictMode.conditionallyCheckInstanceCounts();
>>>>>>> 9240f16d771549b62b5f10efe9f784d87a0afaa4
    }

    final void performDestroy() {
Solution content 
    
            mStopped = true;
        }
        mResumed = false;

        // Check for Activity leaks, if enabled.
        StrictMode.conditionallyCheckInstanceCounts();
    }

    final void performDestroy() {
File
Activity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method invocation