diff options
| author | 2014-10-01 22:03:58 -0700 | |
|---|---|---|
| committer | 2014-10-01 23:26:06 -0700 | |
| commit | 87332a7109610d02ac7f5db6af99d3a11813d5c1 (patch) | |
| tree | 19696ad7c6d520eeaff870636aa953a96adcc530 /tools/aapt/CrunchCache.cpp | |
| parent | bee6dfe09d4381f9ddf666fd04012c662f31e7fd (diff) | |
| parent | 1dcc75b2dbaef7c3bb3410187bf38cabca0d1aea (diff) | |
resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
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 +} |