[automerger skipped] Merge Android 14 QPR1 am: 25368c9280 -s ours am: 40c7446d6a -s ours am: 775a4c97de -s ours
am skip reason: Merged-In I047dbc8f673ae8d76c257aef2d37be516feda785 with SHA-1 4e03608d60 is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Scheduling/+/2865762
Change-Id: I386a41b8ce06cce1672f2f0692ce956d24689e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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