Projects >> platform_frameworks_base >>99a518ffabacb10171621d0293bf982b85505e66

Chunk
Conflicting content 
        if (pending.compareAndSet(false, true)) {
            snapshotWriter.execute(new Runnable() {
                public void run() {
<<<<<<< HEAD
=======
                    String dir =
                        Environment.getExternalStorageDirectory().getPath() + "/snapshots";
>>>>>>> ca48433afc9fab2a8c0b9913bcf3f525d75ed97f
                    if (!dirMade) {
                        File dir = new File(SNAPSHOT_DIR);
                        dir.mkdirs();
Solution content 
        if (pending.compareAndSet(false, true)) {
            snapshotWriter.execute(new Runnable() {
                public void run() {
                    if (!dirMade) {
                        File dir = new File(SNAPSHOT_DIR);
                        dir.mkdirs();
File
SamplingProfilerIntegration.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable