diff options
| author | 2014-10-01 23:34:43 -0700 | |
|---|---|---|
| committer | 2014-10-01 23:35:41 -0700 | |
| commit | 8daabceb2efddebe2e7c0b2425ad9f8ef62c0a5c (patch) | |
| tree | 230e918cee633aa61318edf50e902c44e4a84fde /tools/aapt/CrunchCache.cpp | |
| parent | 9f905f37b229294753ef08ee104a00f611de450f (diff) | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (diff) | |
resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp
Change-Id: I8e1c6ee2025b6acd90803545fb95ab1b98560d92
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 +} |