Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes" am: 2026cca40f
am: 4ac60013d4

* commit '4ac60013d453b534517b829848893571639ebd2c':
  bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes
diff --git a/bootstat/boot_event_record_store.cpp b/bootstat/boot_event_record_store.cpp
index 4dab92e..1bdcf2b 100644
--- a/bootstat/boot_event_record_store.cpp
+++ b/bootstat/boot_event_record_store.cpp
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include <cstdlib>
+#include <utility>
 #include <android-base/file.h>
 #include <android-base/logging.h>
 
diff --git a/bootstat/event_log_list_builder.cpp b/bootstat/event_log_list_builder.cpp
index 7eb355a..241e3d5 100644
--- a/bootstat/event_log_list_builder.cpp
+++ b/bootstat/event_log_list_builder.cpp
@@ -17,6 +17,7 @@
 #include "event_log_list_builder.h"
 
 #include <cinttypes>
+#include <memory>
 #include <string>
 #include <android-base/logging.h>
 #include <log/log.h>