Merge tag 'android-10.0.0_r25' into aosp10-4

Android 10.0.0 release 25
2020-03-23 09:56:16 -04:00
parent 901141c2eb 79fa6bdf6b
commit 26d5d5f0b9
785 changed files with 22968 additions and 9422 deletions
@@ -21,13 +21,16 @@
 #include <vector>

 #include <android-base/file.h>
-#include <android-base/test_utils.h>
 #include <gtest/gtest.h>
+<<<<<<< HEAD
 #include <otautil/SysUtil.h>
 #include <otautil/ZipUtil.h>
+=======
+>>>>>>> android-10.0.0_r25
 #include <ziparchive/zip_archive.h>

 #include "common/test_constants.h"
+#include "otautil/sysutil.h"

 TEST(ZipTest, ExtractPackageRecursive) {
  std::string zip_path = from_testdata_base("ziptest_valid.zip");