commit eb24da62ac2556e828ced32a554f69f16cbb7c38
author Yusuke Sato <yusukes@google.com> Wed Aug 05 19:05:17 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 05 19:05:17 2015 +0000
tree 579d6ab1e082e6337c75da95bc343a9821a85614
parent 3c9ec351f179eef81bd625e0e3112e73bedb35ae
parent 3383b141c3ac4426279e649ebcee535890203c3f

am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"

* commit '3383b141c3ac4426279e649ebcee535890203c3f':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

libs/androidfw/ZipFileRO.cpp

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 49fe8a2..96eb649 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -132,6 +132,11 @@
 
 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 : "");