resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/androidfw/ZipUtils.cpp b/libs/androidfw/ZipUtils.cpp
index 6fa0f14ecb8e..5abfc8ee917e 100644
--- a/libs/androidfw/ZipUtils.cpp
+++ b/libs/androidfw/ZipUtils.cpp
@@ -150,7 +150,7 @@ bail:
 
 class FileReader {
 public:
-   FileReader(FILE* fp) :
+   explicit FileReader(FILE* fp) :
        mFp(fp), mReadBuf(new unsigned char[kReadBufSize])
    {
    }
@@ -170,7 +170,7 @@ public:
 
 class FdReader {
 public:
-   FdReader(int fd) :
+   explicit FdReader(int fd) :
        mFd(fd), mReadBuf(new unsigned char[kReadBufSize])
    {
    }