From 7661532ed9ecf8f7de442e39f63e5cb35196a709 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Mon, 31 Jul 2023 09:32:06 -0700
Subject: DO NOT MERGE ANYWHERE - Update studio-1.0-dev to use main branch.

Bug: b/289400079
Change-Id: Ifc19d892f1ec4ce497ce1d318b6add27a749f7db
---
 default.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/default.xml b/default.xml
index dcd570100..5f2b055e5 100644
--- a/default.xml
+++ b/default.xml
@@ -16,29 +16,29 @@
     <copyfile src="base/gradle.properties" dest="tools/gradle.properties" />
   </project>
 
-  <project path="external/ant-glob" name="platform/external/ant-glob" revision="master" />
-  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="master" />
-  <project path="external/gtest" name="platform/external/gtest" revision="master" />
-  <project path="external/emma" name="platform/external/emma" revision="master"/>
+  <project path="external/ant-glob" name="platform/external/ant-glob" revision="main" />
+  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" revision="main" />
+  <project path="external/gtest" name="platform/external/gtest" revision="main" />
+  <project path="external/emma" name="platform/external/emma" revision="main"/>
   <project path="external/qemu" name="platform/external/qemu" />
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" />
-  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="master" />
-  <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="master" />
-  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="master" />
-  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="master" />
-  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="master"/>
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="master" />
-  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="master" />
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="master" />
+  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" revision="main" />
+  <project path="prebuilts/clang/darwin-x86/sdk/3.5" name="platform/prebuilts/clang/darwin-x86/sdk/3.5" revision="main" />
+  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" revision="main" />
+  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" revision="main" />
+  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" revision="main"/>
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" revision="main" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="main" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="main" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" revision="main" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" revision="main" />
   <project path="sdk" name="platform/sdk" />
   <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" />
   <project path="tools/adt/idea" name="platform/tools/adt/idea" />
   <project path="tools/base" name="platform/tools/base" />
   <project path="tools/emulator" name="platform/tools/emulator" />
   <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" />
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="master"/>
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" revision="main"/>
   <project path="tools/gradle" name="platform/tools/gradle" />
   <project path="tools/idea" name="platform/tools/idea" revision="idea13-1.0-dev" />
   <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" />
-- 
cgit v1.2.3