Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beea2153 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge changes I664fb325,I5e289469 am: 70100168 

am: 833a491f

Change-Id: If9ccdbfe5ee734c9cbd95a0c7bef04e6336d6f48
parents f1c1db01 833a491f

cmds/incident_helper/tests/ih_util_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "ih_util.h"



#include <android-base/file.h>

#include <android-base/test_utils.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <string>

cmds/incidentd/tests/FdBuffer_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include "FdBuffer.h"

#include "incidentd_util.h"



#include <android-base/file.h>

#include <android-base/test_utils.h>

#include <fcntl.h>

#include <gtest/gtest.h>

#include <signal.h>

#include <string.h>



#include <android-base/file.h>

#include <gtest/gtest.h>



using namespace android;

using namespace android::base;

using namespace android::os::incidentd;

cmds/incidentd/tests/Reporter_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
#include <android/os/BnIncidentReportStatusListener.h>

#include <frameworks/base/libs/incident/proto/android/os/header.pb.h>



#include <android-base/file.h>

#include <android-base/test_utils.h>

#include <dirent.h>

#include <string.h>



#include <android-base/file.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <string.h>



using namespace android;

using namespace android::base;

cmds/incidentd/tests/Throttler_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "Throttler.h"



#include <android-base/test_utils.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

tools/aapt2/io/FileStream_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "android-base/file.h"

#include "android-base/macros.h"

#include "android-base/test_utils.h"



#include "test/Test.h"