commit 597067cece8b53effcae3c1f88174eaeba832297
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 12 14:50:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 12 14:50:07 2018 +0000
tree dfe83fbcef8e9991b7d6e3dbb25081bb6d9525bd
parent 665efb0aff088e36f48e4b8e52260470211f9ac6
parent da210f0061405220c8028e9e38dec938a9a64ed0

Merge "Remove more semicolons at the end of namespaces"

fastboot/bootimg_utils.cpp

diff --git a/fastboot/bootimg_utils.cpp b/fastboot/bootimg_utils.cpp
index feacaa1..c9814e4 100644
--- a/fastboot/bootimg_utils.cpp
+++ b/fastboot/bootimg_utils.cpp
@@ -44,7 +44,7 @@
                            const boot_img_hdr_v1& src, int64_t* bootimg_size) {
     const size_t page_mask = src.page_size - 1;
 
-    int64_t header_actual = sizeof(boot_img_hdr_v1) & (~page_mask);
+    int64_t header_actual = (sizeof(boot_img_hdr_v1) + page_mask) & (~page_mask);
     int64_t kernel_actual = (kernel_size + page_mask) & (~page_mask);
     int64_t ramdisk_actual = (ramdisk_size + page_mask) & (~page_mask);
     int64_t second_actual = (second_size + page_mask) & (~page_mask);

storaged/OWNERS

diff --git a/storaged/OWNERS b/storaged/OWNERS
index c6feee8..d033f00 100644
--- a/storaged/OWNERS
+++ b/storaged/OWNERS
@@ -1,2 +1,2 @@
-jinqian@google.com
 salyzyn@google.com
+dvander@google.com