Tianjie Xu 81e54eddd4 resolve merge conflicts of 434697f to master ...

Change-Id: I0fea3d33b97065a3bf50f8e3669c2b50166a14ed

2016-10-18 15:33:23 -07:00

..

include/updater

Replace minzip with libziparchive

2016-10-17 17:41:51 -07:00

Android.mk

Replace minzip with libziparchive

2016-10-17 17:41:51 -07:00

blockimg.cpp

Replace minzip with libziparchive

2016-10-17 17:41:51 -07:00

install.cpp

Replace minzip with libziparchive

2016-10-17 17:41:51 -07:00

updater.cpp

resolve merge conflicts of 434697f to master

2016-10-18 15:33:23 -07:00