| commit | 457c855a436f696d4f70546c2aac91066500ac95 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 11 22:57:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:57:37 2023 +0000 |
| tree | de3bf9c397fadb1f7baedb9f22d0e02f2d9165cf | |
| parent | f8a3a691acb7ad666fb9c49afa077bd5b51fd132 [diff] | |
| parent | a6af8cf0b4ca2eb4e691586a37fcff6201cb9b91 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 227a562993 -s ours am: ec0186f9b4 -s ours am: a6af8cf0b4 -s ours am skip reason: Merged-In Id77761a24c72b0d08c4a4d300822c839664a890e with SHA-1 acb54f84d8 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/2862454 Change-Id: I100fdbf2788da435098ee8cff6e5983b1b0683d2 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 8e25222..8902563 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.sdkext/sdk/sdkextensions-sdk-current.zip" + build_id: "10917791" + target: "mainline_modules_sdks-trunk-userdebug" + source_file: "mainline-sdks/for-latest-build/current/com.google.android.sdkext/sdk/sdkextensions-sdk-current.zip" } dest_file: "current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/SdkExtensions" - 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 786ea27..72107c8 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.sdkext/sdk/sdkextensions-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.sdkext/sdk/sdkextensions-sdk-current.zip" } dest_file: "go/current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/SdkExtensions" - git_branch: "udc-dev" + git_branch: "main" transform: TRANSFORM_UNZIP transform_options { }
diff --git a/current/sdk_library/public/framework-sdkextensions-stubs.jar b/current/sdk_library/public/framework-sdkextensions-stubs.jar index 5df1f66..b0aaca7 100644 --- a/current/sdk_library/public/framework-sdkextensions-stubs.jar +++ b/current/sdk_library/public/framework-sdkextensions-stubs.jar Binary files differ
diff --git a/current/sdk_library/public/framework-sdkextensions.srcjar b/current/sdk_library/public/framework-sdkextensions.srcjar index 4378b65..4d65e34 100644 --- a/current/sdk_library/public/framework-sdkextensions.srcjar +++ b/current/sdk_library/public/framework-sdkextensions.srcjar Binary files differ
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/sdk_library/public/framework-sdkextensions-stubs.jar b/go/current/sdk_library/public/framework-sdkextensions-stubs.jar index 5df1f66..b0aaca7 100644 --- a/go/current/sdk_library/public/framework-sdkextensions-stubs.jar +++ b/go/current/sdk_library/public/framework-sdkextensions-stubs.jar Binary files differ
diff --git a/go/current/sdk_library/public/framework-sdkextensions.srcjar b/go/current/sdk_library/public/framework-sdkextensions.srcjar index 4378b65..4d65e34 100644 --- a/go/current/sdk_library/public/framework-sdkextensions.srcjar +++ b/go/current/sdk_library/public/framework-sdkextensions.srcjar Binary files differ
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