resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp

Change-Id: I889d94a723415ad2e660b8c99e66935142918bc4
2016-06-30 14:36:59 -07:00
parent 937ca850ec 2f272c0551
commit 9b15ba8269
10 changed files with 328 additions and 397 deletions
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -110,7 +110,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
-#include <bootloader_message_writer.h>
+#include <bootloader_message/bootloader_message.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
 #include <cutils/sockets.h>