diff options
| author | 2014-10-02 06:36:41 +0000 | |
|---|---|---|
| committer | 2014-10-02 06:43:47 +0000 | |
| commit | 548bb3d3521eee5b9f34b2860c698cb0c5226e27 (patch) | |
| tree | 52c396bb586f8852ae86f59a526eea2f5f67dab4 /tools/aapt/CrunchCache.cpp | |
| parent | 06b4f4589992886b59b1f1858c13abf7fe239eef (diff) | |
| parent | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c (diff) | |
Merge "resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
Diffstat (limited to 'tools/aapt/CrunchCache.cpp')
| -rw-r--r-- | tools/aapt/CrunchCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/CrunchCache.cpp b/tools/aapt/CrunchCache.cpp index c4cf6bc8494f..6c39d1d7753c 100644 --- a/tools/aapt/CrunchCache.cpp +++ b/tools/aapt/CrunchCache.cpp @@ -101,4 +101,4 @@ bool CrunchCache::needsUpdating(String8 relativePath) const time_t sourceDate = mSourceFiles.valueFor(mSourcePath.appendPathCopy(relativePath)); time_t destDate = mDestFiles.valueFor(mDestPath.appendPathCopy(relativePath)); return sourceDate > destDate; -}
\ No newline at end of file +} |