commit cc7e69d1dee93167d111747d7115ebdaa662db43
author Xin Li <delphij@google.com> Wed Mar 06 09:30:15 2024 -0800
committer Xin Li <delphij@google.com> Wed Mar 06 09:30:15 2024 -0800
tree 2e037661f0a85e542b88fdccf62cfec8fc58f750
parent 8edd46940633d5eda5acefc621cf4a23c372a900
parent d5a87a2e4f10c0069a245e7436464e79fa42aabe

Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: Icde7a90e1903f9a995719dd284b36064059ae5e0
Change-Id: I573246f718f5b2101cfe4036dcb1fdcda560cf21

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

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 {
   }

.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb

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 {
   }

current/arm/lib/libstatspull.so

diff --git a/current/arm/lib/libstatspull.so b/current/arm/lib/libstatspull.so
index 7ddb5ba..dcf88b5 100755
--- a/current/arm/lib/libstatspull.so
+++ b/current/arm/lib/libstatspull.so
Binary files differ

current/arm/lib/libstatssocket.so

diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so
index b4c2891..4214ef2 100755
--- a/current/arm/lib/libstatssocket.so
+++ b/current/arm/lib/libstatssocket.so
Binary files differ

current/arm64/lib/libstatspull.so

diff --git a/current/arm64/lib/libstatspull.so b/current/arm64/lib/libstatspull.so
index 785ed5e..08c8af7 100755
--- a/current/arm64/lib/libstatspull.so
+++ b/current/arm64/lib/libstatspull.so
Binary files differ

current/arm64/lib/libstatssocket.so

diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so
index 27b6a6e..d1aaaa0 100755
--- a/current/arm64/lib/libstatssocket.so
+++ b/current/arm64/lib/libstatssocket.so
Binary files differ

current/snapshot-creation-build-number.txt

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

current/x86/lib/libstatspull.so

diff --git a/current/x86/lib/libstatspull.so b/current/x86/lib/libstatspull.so
index 3f704f6..bbe0774 100755
--- a/current/x86/lib/libstatspull.so
+++ b/current/x86/lib/libstatspull.so
Binary files differ

current/x86/lib/libstatssocket.so

diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so
index c207389..f7a2434 100755
--- a/current/x86/lib/libstatssocket.so
+++ b/current/x86/lib/libstatssocket.so
Binary files differ

current/x86_64/lib/libstatspull.so

diff --git a/current/x86_64/lib/libstatspull.so b/current/x86_64/lib/libstatspull.so
index 5dbcddc..374b9ae 100755
--- a/current/x86_64/lib/libstatspull.so
+++ b/current/x86_64/lib/libstatspull.so
Binary files differ

current/x86_64/lib/libstatssocket.so

diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so
index d38b424..6f28f67 100755
--- a/current/x86_64/lib/libstatssocket.so
+++ b/current/x86_64/lib/libstatssocket.so
Binary files differ

go/current/arm/lib/libstatspull.so

diff --git a/go/current/arm/lib/libstatspull.so b/go/current/arm/lib/libstatspull.so
index 7ddb5ba..dcf88b5 100755
--- a/go/current/arm/lib/libstatspull.so
+++ b/go/current/arm/lib/libstatspull.so
Binary files differ

go/current/arm/lib/libstatssocket.so

diff --git a/go/current/arm/lib/libstatssocket.so b/go/current/arm/lib/libstatssocket.so
index b4c2891..4214ef2 100755
--- a/go/current/arm/lib/libstatssocket.so
+++ b/go/current/arm/lib/libstatssocket.so
Binary files differ

go/current/arm64/lib/libstatspull.so

diff --git a/go/current/arm64/lib/libstatspull.so b/go/current/arm64/lib/libstatspull.so
index 785ed5e..08c8af7 100755
--- a/go/current/arm64/lib/libstatspull.so
+++ b/go/current/arm64/lib/libstatspull.so
Binary files differ

go/current/arm64/lib/libstatssocket.so

diff --git a/go/current/arm64/lib/libstatssocket.so b/go/current/arm64/lib/libstatssocket.so
index 27b6a6e..d1aaaa0 100755
--- a/go/current/arm64/lib/libstatssocket.so
+++ b/go/current/arm64/lib/libstatssocket.so
Binary files differ

go/current/snapshot-creation-build-number.txt

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

go/current/x86/lib/libstatspull.so

diff --git a/go/current/x86/lib/libstatspull.so b/go/current/x86/lib/libstatspull.so
index 3f704f6..bbe0774 100755
--- a/go/current/x86/lib/libstatspull.so
+++ b/go/current/x86/lib/libstatspull.so
Binary files differ

go/current/x86/lib/libstatssocket.so

diff --git a/go/current/x86/lib/libstatssocket.so b/go/current/x86/lib/libstatssocket.so
index c207389..f7a2434 100755
--- a/go/current/x86/lib/libstatssocket.so
+++ b/go/current/x86/lib/libstatssocket.so
Binary files differ

go/current/x86_64/lib/libstatspull.so

diff --git a/go/current/x86_64/lib/libstatspull.so b/go/current/x86_64/lib/libstatspull.so
index 5dbcddc..374b9ae 100755
--- a/go/current/x86_64/lib/libstatspull.so
+++ b/go/current/x86_64/lib/libstatspull.so
Binary files differ

go/current/x86_64/lib/libstatssocket.so

diff --git a/go/current/x86_64/lib/libstatssocket.so b/go/current/x86_64/lib/libstatssocket.so
index d38b424..6f28f67 100755
--- a/go/current/x86_64/lib/libstatssocket.so
+++ b/go/current/x86_64/lib/libstatssocket.so
Binary files differ