Projects >> android-sdk >>82193e9b8ccca5c4d5021bee57f8f4607b9a97fc

Chunk
Conflicting content 
                        }
                    }
                }
<<<<<<< HEAD
            } else {
                // no input? we consider all files.
                if (prereq.lastModified() > oldestTarget) {
                    return DependencyStatus.UPDATED_FILE;
                }
=======
>>>>>>> 0802f23053c774a0ed8d122532a9694f742cc74f
            }
        }
Solution content 
                        }
                    }
                }
            } else {
                // no input? we consider all files.
                if (prereq.lastModified() > oldestTarget) {
                    return DependencyStatus.UPDATED_FILE;
                }
            }
        }
File
DependencyGraph.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement