From a5dac1a35ba2876451dfee769830dff7e587c692 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 28 Jun 2016 21:59:33 -0700
Subject: [PATCH] Fix build breakage from merge conflict resolution.

Change-Id: Icb623ebfb53a366cdd56674e87fa0781683e144e
---
 fastboot/fastboot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 9cb61c388..3ae7408cb 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1090,7 +1090,7 @@ static void do_flashall(Transport* transport, const char* slot_override, int era
 
     setup_requirements(reinterpret_cast<char*>(data), sz);
 
-    for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
+    for (size_t i = 0; i < arraysize(images); i++) {
         fname = find_item(images[i].part_name, product);
         fastboot_buffer buf;
         if (!load_buf(transport, fname.c_str(), &buf)) {