commit 434697f06b7432a2358550eadd74fb97d617035c
author Tianjie Xu <xunchang@google.com> Tue Oct 18 22:05:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 22:05:21 2016 +0000
tree c24e3fb0f24bd693e63bfed48e497730164df079
parent 13d8ee8c72ae3705819e1e0afae765e2d66a89bf
parent 8176cf232e9f613a2e500f09461fc3f448267d07

resolve merge conflicts of 6fba98c to stage-aosp-master
am: 8176cf232e

Change-Id: I01b34cb31604ea5caffe96ad69ab4d4d21bfe28e

install.cpp

diff --git a/install.cpp b/install.cpp
index fada2de..919f241 100644
--- a/install.cpp
+++ b/install.cpp
@@ -544,7 +544,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));
         }