summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-03-06 09:30:15 -0800
committerXin Li <delphij@google.com>2024-03-06 09:30:15 -0800
commitc3e5f3aff9f6a026cae5bd8d9dc8f536b1516763 (patch)
tree43f289aad78c648a543058ccc6ff99c23e80f3dc
parent25368c9280df48d0918cb8c417139e1060d94cbb (diff)
parentc7ee22281f4eba0b87f4bb4c74c5e8f47b9d60fd (diff)
downloadScheduling-master.tar.gz
Merge Android 14 QPR2 to AOSP mainHEADmastermain
Bug: 319669529 Merged-In: I0dfac974e4f6ce7eeebd33b30a2d77e40c7fc438 Change-Id: I248c9b1676cfc834b7e65a3b9520a72a3e8183f4
-rw-r--r--.prebuilt_info/prebuilt_info_current_current_zip.asciipb8
-rw-r--r--.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb8
-rw-r--r--current/snapshot-creation-build-number.txt2
-rw-r--r--go/current/snapshot-creation-build-number.txt2
4 files changed, 10 insertions, 10 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 6a79378..83eb900 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1007601"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Scheduling"
- git_branch: "udc-d1-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 44e13b1..294cd8b 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,14 +1,14 @@
drops {
android_build_drop {
- build_id: "T1007188"
- target: "train_build"
- source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.scheduling/sdk/scheduling-sdk-current.zip"
+ build_id: "10917791"
+ target: "mainline_go_modules_sdks-trunk-userdebug"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.scheduling/sdk/scheduling-sdk-current.zip"
}
dest_file: "go/current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Scheduling"
- git_branch: "udc-dev"
+ git_branch: "main"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index d33d0a0..fffc196 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802 \ No newline at end of file
+10917791 \ No newline at end of file
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..fffc196 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058 \ No newline at end of file
+10917791 \ No newline at end of file