diff options
author | Xin Li <delphij@google.com> | 2024-01-17 22:14:48 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-01-17 22:14:48 -0800 |
commit | d5a87a2e4f10c0069a245e7436464e79fa42aabe (patch) | |
tree | 2e037661f0a85e542b88fdccf62cfec8fc58f750 | |
parent | 57eb350a02ac35d793bd72e5e437788a527475b5 (diff) | |
parent | fecb34853cddba71a75e7af36cd39a76592cfcdb (diff) | |
download | StatsD-temp_319669529.tar.gz |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: I4069729dcd6262d72759d4a02351b61f4f44a86c
Change-Id: Icde7a90e1903f9a995719dd284b36064059ae5e0
20 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 0e2c9cb..7791fb2 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.os.statsd/sdk/statsd-module-sdk-current.zip" + build_id: "10917791" + target: "mainline_modules_sdks-trunk-userdebug" + source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip" } dest_file: "current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/StatsD" - 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 0091f6f..9033c0f 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.os.statsd/sdk/statsd-module-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.os.statsd/sdk/statsd-module-sdk-current.zip" } dest_file: "go/current/current.zip" version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/StatsD" - git_branch: "udc-dev" + git_branch: "main" transform: TRANSFORM_UNZIP transform_options { } diff --git a/current/arm/lib/libstatspull.so b/current/arm/lib/libstatspull.so Binary files differindex 7ddb5ba..dcf88b5 100755 --- a/current/arm/lib/libstatspull.so +++ b/current/arm/lib/libstatspull.so diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so Binary files differindex b4c2891..4214ef2 100755 --- a/current/arm/lib/libstatssocket.so +++ b/current/arm/lib/libstatssocket.so diff --git a/current/arm64/lib/libstatspull.so b/current/arm64/lib/libstatspull.so Binary files differindex 785ed5e..08c8af7 100755 --- a/current/arm64/lib/libstatspull.so +++ b/current/arm64/lib/libstatspull.so diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so Binary files differindex 27b6a6e..d1aaaa0 100755 --- a/current/arm64/lib/libstatssocket.so +++ b/current/arm64/lib/libstatssocket.so 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/current/x86/lib/libstatspull.so b/current/x86/lib/libstatspull.so Binary files differindex 3f704f6..bbe0774 100755 --- a/current/x86/lib/libstatspull.so +++ b/current/x86/lib/libstatspull.so diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so Binary files differindex c207389..f7a2434 100755 --- a/current/x86/lib/libstatssocket.so +++ b/current/x86/lib/libstatssocket.so diff --git a/current/x86_64/lib/libstatspull.so b/current/x86_64/lib/libstatspull.so Binary files differindex 5dbcddc..374b9ae 100755 --- a/current/x86_64/lib/libstatspull.so +++ b/current/x86_64/lib/libstatspull.so diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so Binary files differindex d38b424..6f28f67 100755 --- a/current/x86_64/lib/libstatssocket.so +++ b/current/x86_64/lib/libstatssocket.so diff --git a/go/current/arm/lib/libstatspull.so b/go/current/arm/lib/libstatspull.so Binary files differindex 7ddb5ba..dcf88b5 100755 --- a/go/current/arm/lib/libstatspull.so +++ b/go/current/arm/lib/libstatspull.so diff --git a/go/current/arm/lib/libstatssocket.so b/go/current/arm/lib/libstatssocket.so Binary files differindex b4c2891..4214ef2 100755 --- a/go/current/arm/lib/libstatssocket.so +++ b/go/current/arm/lib/libstatssocket.so diff --git a/go/current/arm64/lib/libstatspull.so b/go/current/arm64/lib/libstatspull.so Binary files differindex 785ed5e..08c8af7 100755 --- a/go/current/arm64/lib/libstatspull.so +++ b/go/current/arm64/lib/libstatspull.so diff --git a/go/current/arm64/lib/libstatssocket.so b/go/current/arm64/lib/libstatssocket.so Binary files differindex 27b6a6e..d1aaaa0 100755 --- a/go/current/arm64/lib/libstatssocket.so +++ b/go/current/arm64/lib/libstatssocket.so 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 diff --git a/go/current/x86/lib/libstatspull.so b/go/current/x86/lib/libstatspull.so Binary files differindex 3f704f6..bbe0774 100755 --- a/go/current/x86/lib/libstatspull.so +++ b/go/current/x86/lib/libstatspull.so diff --git a/go/current/x86/lib/libstatssocket.so b/go/current/x86/lib/libstatssocket.so Binary files differindex c207389..f7a2434 100755 --- a/go/current/x86/lib/libstatssocket.so +++ b/go/current/x86/lib/libstatssocket.so diff --git a/go/current/x86_64/lib/libstatspull.so b/go/current/x86_64/lib/libstatspull.so Binary files differindex 5dbcddc..374b9ae 100755 --- a/go/current/x86_64/lib/libstatspull.so +++ b/go/current/x86_64/lib/libstatspull.so diff --git a/go/current/x86_64/lib/libstatssocket.so b/go/current/x86_64/lib/libstatssocket.so Binary files differindex d38b424..6f28f67 100755 --- a/go/current/x86_64/lib/libstatssocket.so +++ b/go/current/x86_64/lib/libstatssocket.so |