Merge "Moving logging include" am: 729c159744 am: babdb7b2c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536970
Change-Id: Ibbf7c990ccbabbda494435ea409fb93150de150d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fastboot/fastboot_driver.h b/fastboot/fastboot_driver.h
index f60c9f1..64e3c2b 100644
--- a/fastboot/fastboot_driver.h
+++ b/fastboot/fastboot_driver.h
@@ -33,7 +33,6 @@
#include <vector>
#include <android-base/endian.h>
-#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
#include <bootimg.h>
diff --git a/fastboot/task.cpp b/fastboot/task.cpp
index de48a16..d43fd80 100644
--- a/fastboot/task.cpp
+++ b/fastboot/task.cpp
@@ -14,13 +14,16 @@
// limitations under the License.
//
#include "task.h"
+
#include <iostream>
+
+#include <android-base/logging.h>
+#include <android-base/parseint.h>
+
#include "fastboot.h"
#include "filesystem.h"
#include "super_flash_helper.h"
-#include <android-base/parseint.h>
-
using namespace std::string_literals;
FlashTask::FlashTask(const std::string& _slot, const std::string& _pname, const std::string& _fname,
const bool apply_vbmeta)