diff options
| author | 2015-08-05 20:34:31 +0000 | |
|---|---|---|
| committer | 2015-08-05 20:34:31 +0000 | |
| commit | 5387f60ba26ae89e31e776202fbf13287dc620a8 (patch) | |
| tree | b7d23519fbd3c5b8a4e348b338022e4220f75e4e /libs/androidfw/ZipFileRO.cpp | |
| parent | a0f6759424d637d5688c5b318f47033ba41e67d6 (diff) | |
| parent | ead2088efe305320cf860c4eb60b2b0381930635 (diff) | |
Merge "Fix build breakage caused by r.android.com/162907" into mnc-dr-dev-plus-aosp
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index 96eb64962b97..49fe8a261178 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -132,11 +132,6 @@ bool ZipFileRO::startIteration(void** cookie) { bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix) { - return startIteration(cookie, NULL, NULL); -} - -bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix) -{ _ZipEntryRO* ze = new _ZipEntryRO; ZipString pe(prefix ? prefix : ""); ZipString se(suffix ? suffix : ""); |