commit 36415acf6a840f80d8d52b957b117d48ddb8c9fe
author Tao Bao <tbao@google.com> Fri Oct 14 23:40:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 14 23:40:53 2016 +0000
tree e8abe9c634ed821359ad3bf70a80170f9c7b3e52
parent 1709d22b4ec007da172e2d49ced99847c6f00225
parent ddf293aa0cfe6ba9562ad12bc8555e6f389db53f

resolve merge conflicts of 08d0ae9 to stage-aosp-master
am: ddf293aa0c

Change-Id: Ia4fb968c0b45b584a69f28401507826f837a978d

install.cpp

diff --git a/install.cpp b/install.cpp
index 83ddc4b..aa1fe17 100644
--- a/install.cpp
+++ b/install.cpp
@@ -537,7 +537,7 @@
         if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
             PLOG(WARNING) << "failed to read uncrypt status";
         } else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
-            PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
+            LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
         } else {
             log_buffer.push_back(android::base::Trim(uncrypt_status));
         }