StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,984 Commits 1 Branch 0 Tags
b25b34ede7a664b39dff32b7768034ffd0d54e6c
Commit Graph

96984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
b25b34ede7 Merge "Move frameworks/base/Android.mk to build/core" into main am: 9ba9e0a71e am: 5fe2ba2087 
Original change: https://android-review.googlesource.com/c/platform/build/+/2988638

Change-Id: I5e25b65ffb7e72cda7f699e3cbe64086a80a9800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-18 03:55:28 +00:00
Treehugger Robot
5fe2ba2087 Merge "Move frameworks/base/Android.mk to build/core" into main am: 9ba9e0a71e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2988638

Change-Id: Ib96d29d1eb5ccf38947b134acfaed22f41fb5591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-18 03:38:01 +00:00
Treehugger Robot
9ba9e0a71e Merge "Move frameworks/base/Android.mk to build/core" into main 2024-03-18 03:21:47 +00:00
Jeongik Cha
45cf38be7b Merge "Use soong modules for init.*.rc" into main am: 784f2a899c am: 2e976ef3ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2926410

Change-Id: I1ba526f8a5fccfaa29667d9dda19d3d93dd9c810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-18 02:10:19 +00:00
Jeongik Cha
2e976ef3ea Merge "Use soong modules for init.*.rc" into main am: 784f2a899c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2926410

Change-Id: I68d469d83ac130a17bbbb6949574de370c2102f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-18 01:45:47 +00:00
Jeongik Cha
784f2a899c Merge "Use soong modules for init.*.rc" into main 2024-03-18 01:25:16 +00:00
Chris Li
d638f6b42e Merge "Reland WM Extensions for all devices" into main 2024-03-16 07:59:03 +00:00
Treehugger Robot
c35da593cb Merge "Disable WITHOUT_CHECK_API for SDK products" into main am: 7665dbccdb am: bf23bc1ee8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3003853

Change-Id: I9177c5f6e1d45b7b8cb6826ae9f13f89e5de4a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 21:00:44 +00:00
Treehugger Robot
bf23bc1ee8 Merge "Disable WITHOUT_CHECK_API for SDK products" into main am: 7665dbccdb 
Original change: https://android-review.googlesource.com/c/platform/build/+/3003853

Change-Id: If47d2d419da35e6f4a86160310c5861e5d203424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 20:44:58 +00:00
Treehugger Robot
7665dbccdb Merge "Disable WITHOUT_CHECK_API for SDK products" into main 2024-03-15 20:28:51 +00:00
Ankur Bakshi
f7d3da84f0 [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours am: 4e10edb045 -s ours am: 8be870a42c -s ours am: d9838db9aa -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I669694875c6dca0c59ffdcd029921f5d020f42a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 19:17:40 +00:00
Ankur Bakshi
da89697a25 [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 am: fa693f6760 am: 591f991015 am: cc15cc5962 -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I7a8cf2be3755af5d69bcde6ac3f3675b5597219b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 19:17:23 +00:00
Ankur Bakshi
d9838db9aa [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours am: 4e10edb045 -s ours am: 8be870a42c -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ic0561583666ee5a58c4a5642e532320355a21122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:52:14 +00:00
Ankur Bakshi
31b032826d [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours am: 4e10edb045 -s ours am: 9515f9624d -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ifac5a525c7ec012c8258b069f6ed9b2acc48f2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:52:14 +00:00
Ankur Bakshi
cc15cc5962 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 am: fa693f6760 am: 591f991015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ic54c7e1f8e162bafd56e9247fdedb005e2ce4826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:52:01 +00:00
Ankur Bakshi
3d8cbc4a98 [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 am: fa693f6760 am: 3e408567d3 -s ours 
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ia45378a50be1da4601e55e6cf5009ee4cf7b8e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:51:58 +00:00
Ankur Bakshi
8be870a42c [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours am: 4e10edb045 -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ic1cf9fdf534c85530f8ff075ac2a816fdf90e7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:31:59 +00:00
Ankur Bakshi
9515f9624d [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours am: 4e10edb045 -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Idfc1c99cbcecc8c8eb780ad129d3db8843d20920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:31:51 +00:00
Ankur Bakshi
3e408567d3 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 am: fa693f6760 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Icca838bbc40750525401cd10d097baee2c5098bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:31:42 +00:00
Ankur Bakshi
591f991015 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 am: fa693f6760 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I553ef1f74de33fdb6c6b638695b2ffe2f1894a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:31:25 +00:00
Ankur Bakshi
4e10edb045 [automerger skipped] Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 am: 190f3b02f8 -s ours 
am skip reason: Merged-In I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a with SHA-1 d269659a47 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Idf67d06b3d6219b735d49d4be768b79001837fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:26:42 +00:00
Ankur Bakshi
fa693f6760 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: f998f33775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I362b7357725007b927cf7544fcc2b4f81b853ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:17:07 +00:00
Cole Faust
f408940b9d Merge "Add staging dir stamp files for all partitions" into main am: b5f63e65d7 am: a18a8c8a66 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001001

Change-Id: I25fad10c5b6d4e5393f3ec33ade675dfa335c43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:16:12 +00:00
Ankur Bakshi
190f3b02f8 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 am: 819a1006e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I5b9c177cc2284ba1e33cb33ef4623d27ac693651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 18:11:44 +00:00
Cole Faust
a18a8c8a66 Merge "Add staging dir stamp files for all partitions" into main am: b5f63e65d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001001

Change-Id: Iff0ed80a5a80e930327358dc0ce3c9ad4336a9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 17:56:29 +00:00
Ankur Bakshi
f998f33775 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ifd72e55797e9c89ab36b11ffbf94b270e71a52df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 17:56:26 +00:00
Ankur Bakshi
819a1006e3 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 am: f86c72cb78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I82e102087b3102270cab79f45a1d04f795651491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 17:56:09 +00:00
Cole Faust
b5f63e65d7 Merge "Add staging dir stamp files for all partitions" into main 2024-03-15 17:34:26 +00:00
Ankur Bakshi
f86c72cb78 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 am: 7f71859e75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I6bd6909fd043bd4bdd1754dd3f426b126d74fd6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 17:14:42 +00:00
Ankur Bakshi
7f71859e75 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 am: 643a336516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ie244d9549f5d61781075b88316bc50258b1edeea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 16:51:05 +00:00
Ankur Bakshi
643a336516 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b am: 855beb3d53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Ibb160bf708b882a0750e3a245665796798f576a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 16:29:53 +00:00
Ankur Bakshi
855beb3d53 Update Security String to 2024-05-01 am: d269659a47 am: b46a02e26b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: Iaf82b59563d993faa768b8254a8c5873158d86da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 16:05:54 +00:00
Ankur Bakshi
b46a02e26b Update Security String to 2024-05-01 am: d269659a47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/26566369

Change-Id: I80a913a80700395cd3b780bfc4d3a89cb7867f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 15:27:35 +00:00
Treehugger Robot
1d068f871a Merge "aconfig: c++ read api to return an android::base::Result and cargo fmt" into main am: 6c63da3ce7 am: 430f7b9cab 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001062

Change-Id: Ifeea63fdfdfc01e04c56c30a3c321c9466055dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 14:59:07 +00:00
Treehugger Robot
430f7b9cab Merge "aconfig: c++ read api to return an android::base::Result and cargo fmt" into main am: 6c63da3ce7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001062

Change-Id: I6b28106dc5dea36bdf85ebc7ac1e2bd47d5dbea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 14:41:39 +00:00
Treehugger Robot
6c63da3ce7 Merge "aconfig: c++ read api to return an android::base::Result and cargo fmt" into main 2024-03-15 14:16:27 +00:00
Treehugger Robot
f2c45c4f61 Merge "Remove SignApk output limitation of 2GiB" into main am: 605346e5c8 am: d36b434b15 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001144

Change-Id: I5256f815a567e05df6bdeff066e436c9b66eea15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 03:05:30 +00:00
Treehugger Robot
d36b434b15 Merge "Remove SignApk output limitation of 2GiB" into main am: 605346e5c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3001144

Change-Id: Icd506dcc05860338b034d8ce1a289c3147ce8b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-15 02:46:17 +00:00
Treehugger Robot
605346e5c8 Merge "Remove SignApk output limitation of 2GiB" into main 2024-03-15 02:31:43 +00:00
Treehugger Robot
0a6f82029c Merge "Finalization bugfixes." into main 2024-03-15 02:28:36 +00:00
Chris Li
786527c489 Reland WM Extensions for all devices 
The revert is because there is a prebuilt app using an outdated
unreleased sidecar API (from 2022).

Bug: 306666082
Test: pass the failure test
Change-Id: I74f5f6cff84d7f26466ccdea8bcc982bc363a5d3
 2024-03-15 01:50:03 +00:00
Alex Buynytskyy
5b34f3f627 Finalization bugfixes. 
Keep codenames in the platform_versions.txt to allow for non-REL builds.

Bug: 323940469
Test: local run
Ignore-AOSP-First: Release configs are interal repo only.
Change-Id: I664ac1c32c3aae5175d3b7a36ac763b35181bc22
 2024-03-15 00:31:14 +00:00
Cole Faust
25a2aa8eea Add staging dir stamp files for all partitions 
So they can be used from soong-built partitions.

Bug: 329146343
Test: Manually
Change-Id: I1d0d2f26ffeb60512368d02ce5c054f613f92230
 2024-03-14 17:24:13 -07:00
Ankur Bakshi
d269659a47 Update Security String to 2024-05-01 
Bug: 327392432
Change-Id: I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a
Merged-In: I167be7ba5e93b60d61e9f7bc3028e60dd6c99e0a
Merged-In: I92394c4ae0cc35544e72d72cac6cd3a417b62e06
Merged-In: I90c3486766809f47361677f97cdd3ff0d6ca487e
Merged-In: Id2b65e35697d27e1bd9a65315b6b5ac7fb918b7a
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
 2024-03-14 23:45:08 +00:00
Tomasz Wasilczyk
4045ae7871 Remove SignApk output limitation of 2GiB 
Bug: 302112430
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_RELEASE=trunk_staging CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="art external/aac external/boringssl external/conscrypt external/cpu_features external/dlmalloc external/fdlibm external/libaom external/libavc external/libcxx external/libfuse external/libgav1 external/libgsm external/libhevc external/libmpeg2 external/libopus external/libtextclassifier external/libvpx external/libxaac external/oj-libjdwp external/sonivox external/speex external/tremolo external/vixl frameworks/av frameworks/base/media libcore libnativehelper packages/modules/Bluetooth packages/modules/Connectivity packages/modules/DnsResolver packages/modules/ExtServices packages/modules/NetworkStack packages/modules/NeuralNetworks packages/modules/SdkExtensions packages/modules/StatsD packages/providers/MediaProvider system/core/base system/core/libcutils system/core/libstats system/media/audio_utils system/netd/resolv" com.android.art.testing
      apksigner verify --in $OUT/../generic_x86_64/system/apex/com.android.art.testing.apex --print-certs -v --min-sdk-version 23
Change-Id: Id31eae0f221dd7ef333bd12aeef591463e1c931a
 2024-03-14 14:57:04 -07:00
Peiyong Lin
ee78ef315a [automerger skipped] Merge "Clean up ANGLE on system build configuration." into main am: 7bbfeb147e am: 4ae8b9f170 -s ours 
am skip reason: Merged-In Ie8294b6494e2fad44ff102ecf0018916d61b082a with SHA-1 ee964d2353 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2994810

Change-Id: I5322b463827b150a8f6c781497af4d2f04803444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-14 21:21:33 +00:00
Peiyong Lin
4ae8b9f170 Merge "Clean up ANGLE on system build configuration." into main am: 7bbfeb147e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2994810

Change-Id: I8862468be303d2e72e6d7b3e02ac2de20764f47b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-14 21:02:24 +00:00
Jihoon Kang
c4dc1f69c5 Disable WITHOUT_CHECK_API for SDK products 
SDK products, which are required to build the SDK, require checkapi
to run in order to generate the exportable artifacts, which are copied
to the dist directory. Thus, this change adds a conditional to emit an
error when WITHOUT_CHECK_API environment variable is set when the target
product is a SDK variant.

Test: lunch sdk-trunk_staging-eng && m WITHOUT_CHECK_API=true and observe the expected error being emitted
Bug: 329374072
Change-Id: I0dc628742c49845792b03f9af1ea60cd9eb4b8c3
 2024-03-14 20:43:37 +00:00
Peiyong Lin
7bbfeb147e Merge "Clean up ANGLE on system build configuration." into main 2024-03-14 20:43:18 +00:00
Dennis Shen
856ad07f22 Merge "aconfig_storage: create aconfig storage c++ flag value write api" into main am: aa0287641e am: 7708e2bcde 
Original change: https://android-review.googlesource.com/c/platform/build/+/3004210

Change-Id: Id44358c9e34bada0613ce420ed2311b7c7c5f9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-14 19:56:20 +00:00