resolved conflicts for merge of 368fdba4 to master (c6a98bb7) · Commits · e / os / platform_frameworks_native

libs/utils/StreamingZipInflater.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#define LOG_NDEBUG 1
		#define LOG_TAG "szipinf"
		#include <utils/Log.h>

		@@ -157,7 +158,7 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) {
		*/
		int result = Z_OK;
		if (mStreamNeedsInit) {
		LOGI("Initializing zlib to inflate");
		LOGD("Initializing zlib to inflate");
		result = inflateInit2(&mInflateState, -MAX_WBITS);
		mStreamNeedsInit = false;
		}