am 5387f60b: Merge "Fix build breakage caused by r.android.com/162907" into mnc-dr-dev-plus-aosp

* commit '5387f60ba26ae89e31e776202fbf13287dc620a8':
  Fix build breakage caused by r.android.com/162907
This commit is contained in:
Yusuke Sato
2015-08-05 20:44:58 +00:00
committed by Android Git Automerger

View File

@@ -130,11 +130,6 @@ bool ZipFileRO::startIteration(void** cookie) {
return startIteration(cookie, NULL, NULL);
}
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;