commit 1790fe66e74f05f8d349b141cb0b9bef4248f43e
author Jeff Sharkey <jsharkey@google.com> Mon Oct 12 18:38:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 18:38:56 2015 +0000
tree 5ac22c4b4fb62fc4c68ebd3481006a6876bdc145
parent aeca741ce6c16653a7880055c0c48a8706f5ff0f
parent f68525931e1b9ab6938d87bb95a2fa7966f046c4

am f6852593: am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev

* commit 'f68525931e1b9ab6938d87bb95a2fa7966f046c4':
  Clean up any/all stale partition tables.

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index a9a8031..3a87741 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -44,8 +44,6 @@
 #include "Process.h"
 #include "Loop.h"
 #include "Devmapper.h"
-#include "Ext4Crypt.h"
-#include "cryptfs.h"
 #include "MoveTask.h"
 #include "TrimTask.h"
 

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
old mode 100755
new mode 100644

fs/F2fs.cpp

diff --git a/fs/F2fs.cpp b/fs/F2fs.cpp
index b947822..87b131e 100644
--- a/fs/F2fs.cpp
+++ b/fs/F2fs.cpp
@@ -43,7 +43,7 @@
 status_t Check(const std::string& source) {
     std::vector<std::string> cmd;
     cmd.push_back(kFsckPath);
-    cmd.push_back("-f");
+    cmd.push_back("-a");
     cmd.push_back(source);
 
     // f2fs devices are currently always trusted