| commit | a6618368d31dec17951f04a435635b22d4207fae | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 19 23:55:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 23:55:00 2023 +0000 |
| tree | 22820528bf49747c7b0c6c3a9794a37aaa7cfd19 | |
| parent | 1370422c0170e90c605513b739fdea06e331ef2e [diff] | |
| parent | 6bae0c9bed6ee5491461dd2bb21c61da8fc9bd23 [diff] |
[automerger skipped] Merge 10952656 am: 86779def31 -s ours am: 6bae0c9bed -s ours am skip reason: Merged-In I0ad1654ff2f31a4314a9825731023085b38b9972 with SHA-1 7ab8507c98 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/RemoteKeyProvisioning/+/25093012 Change-Id: I7651bfbca8faeac516f58fd198be4d9ef9591942 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 9c030d2..ce76626 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.rkpd/sdk/rkpd-sdk-current.zip" + build_id: "10917791" + target: "mainline_modules_sdks-trunk-userdebug" + source_file: "mainline-sdks/for-latest-build/current/com.google.android.rkpd/sdk/rkpd-sdk-current.zip" } dest_file: "current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/RemoteKeyProvisioning" - 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 3ec8ebe..6e1ba59 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.rkpd/sdk/rkpd-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.rkpd/sdk/rkpd-sdk-current.zip" } dest_file: "go/current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/RemoteKeyProvisioning" - 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