diff options
| author | Yabin Cui <yabinc@google.com> | 2016-06-30 14:36:59 -0700 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2016-06-30 15:13:12 -0700 |
| commit | 9b15ba8269f7a2cb63ac31185fcbb17c86236f99 (patch) | |
| tree | 48a5ceff01d266f82a3594d703a79806a6ce099e /uncrypt/uncrypt.cpp | |
| parent | 937ca850ecda287872e36c8a75b8c035d407d44d (diff) | |
| parent | 2f272c0551f984e83bc5abaf240e0dddb38a3326 (diff) | |
| download | android_bootable_recovery-9b15ba8269f7a2cb63ac31185fcbb17c86236f99.tar.gz android_bootable_recovery-9b15ba8269f7a2cb63ac31185fcbb17c86236f99.tar.bz2 android_bootable_recovery-9b15ba8269f7a2cb63ac31185fcbb17c86236f99.zip | |
resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp
Change-Id: I889d94a723415ad2e660b8c99e66935142918bc4
Diffstat (limited to 'uncrypt/uncrypt.cpp')
| -rw-r--r-- | uncrypt/uncrypt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 0f2487d3..c19943fa 100644 --- 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> |