commit 2a576e20975b9a12610d19c3d782045b7fa227b8
author Tao Bao <tbao@google.com> Tue Oct 18 23:00:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 23:00:55 2016 +0000
tree 4511c43e2ed24d872bc3142374bdbc255bf7fc22
parent 434697f06b7432a2358550eadd74fb97d617035c
parent 69c117c2ffb71cdbfde71c65d510014e162a1016

resolve merge conflicts of e89bf25 to stage-aosp-master
am: 69c117c2ff

Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d

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));
         }