resolve merge conflicts of ce58688 to nyc-dev-plus-aosp

Change-Id: Ia9bfb989b6d13ee4f6a22216beb94065a9487484
2016-03-17 15:44:33 -07:00
parent d6e586204f ce5868862a
commit 6f446373fd
10 changed files with 139 additions and 241 deletions
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -34,8 +34,8 @@
 #include "applypatch/applypatch.h"
 #include "mtdutils/mtdutils.h"
 #include "edify/expr.h"
-#include "ota_io.h"
 #include "print_sha1.h"
+#include "otafault/ota_io.h"

 static int LoadPartitionContents(const char* filename, FileContents* file);
 static ssize_t FileSink(const unsigned char* data, ssize_t len, void* token);