Android Build Coastguard Worker
33dd5b59b8
Make change and version bump to UP1A.230618.001
...
Snap for 10342804 from 5b0c29645f
to udc-release
Change-Id: Ie40fb840f1d5861cab6f5c4771669d58a8b49865
2023-06-17 21:43:01 +00:00
Android Build Coastguard Worker
de78d181c8
[coastguard skipped] Merge sparse cherrypicks from sparse-10337615-L26100000961361154 into udc-release.
...
COASTGUARD_SKIP: I1c4705ed40c38dc09d4b470704eac8972ceb126c
Change-Id: Ib20b2880ca5660c2f7a73ba1dab54a7eb627e8f1
2023-06-17 02:28:37 +00:00
Android Build Coastguard Worker
2525ad9e3c
Version bump to UP1A.230616.003.A1 [core/build_id.mk]
...
Change-Id: I1c4705ed40c38dc09d4b470704eac8972ceb126c
2023-06-17 02:26:34 +00:00
Android Build Coastguard Worker
e89cd7acae
Make change and version bump to UP1A.230617.001
...
Snap for 10338099 from 5b0c29645f
to udc-release
Change-Id: Ief41ba9f7d7b6da79892465247d500b076354eaf
2023-06-17 01:47:30 +00:00
Android Build Coastguard Worker
9ee813091f
Version bump to UP1A.230616.003 [core/build_id.mk]
...
Change-Id: Id4ca7db932507ef1167a2fc15755e233103d6399
2023-06-16 16:38:12 +00:00
Lokesh Kumar Goel
5b0c29645f
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours am: 846336796d
-s ours am: d6b38eb87a
-s ours am: 04737c1d11
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: Ibb5969e8c28d6e2c6858351408b54264b9d1b9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 10:06:49 +00:00
Lokesh Kumar Goel
04737c1d11
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours am: 846336796d
-s ours am: d6b38eb87a
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I39edfd1ead48eb174013e8258cf000fe428522c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 09:24:43 +00:00
Lokesh Kumar Goel
431c2eb92d
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours am: 846336796d
-s ours am: 4c0aa1fcfb
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I03c759ff22c0ab31fd21e54906dfd47023478a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 09:22:03 +00:00
Lokesh Kumar Goel
d6b38eb87a
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours am: 846336796d
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I53c1a42baef3d8ca94b676db965461e7281f923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 08:39:56 +00:00
Lokesh Kumar Goel
4c0aa1fcfb
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours am: 846336796d
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I79531bd248fabea1eed319426345682de012f676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 08:39:10 +00:00
Lokesh Kumar Goel
846336796d
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours am: fa43562ebf
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: Ie43851fd2e91738ec9efc8e16cb8d66eece6250b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 08:12:07 +00:00
Lokesh Kumar Goel
fa43562ebf
[automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
am: 6e8c32b58f
-s ours
...
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I61f0420c24c9853b4339577d517325207bd01044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 07:32:20 +00:00
Lokesh Kumar Goel
6e8c32b58f
Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
am: bd58a9d5b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: Ie8ce56f52a660d20afb4575fff30dbc112cf72df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 06:55:00 +00:00
Lokesh Kumar Goel
bd58a9d5b7
Update Security String to 2023-08-01 am: 85adf2e404
am: e4e40fc164
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: I4977b1c2f3b0eab8a45fd46e9bb1698dd5a80a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 06:11:46 +00:00
Lokesh Kumar Goel
e4e40fc164
Update Security String to 2023-08-01 am: 85adf2e404
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873
Change-Id: Ied32ee5938a7fc5bb382db18866e21473e9d750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-16 05:24:22 +00:00
Android Build Coastguard Worker
001218918f
Version bump to UP1A.230616.002 [core/build_id.mk]
...
Change-Id: I8b3b07f35cde59f8fe2d9e065e0700083cfa9e43
2023-06-16 02:28:26 +00:00
Lokesh Kumar Goel
85adf2e404
Update Security String to 2023-08-01
...
Bug: 285692955
Change-Id: I0f39a4929744496beb9641b67055f8900356f995
Merged-In: I137506c673d9f44789c26f88a416c0fd06df02ce
Merged-In: Iec37a521c10365635950d6646f57153e7d3e3794
2023-06-16 02:11:29 +00:00
Android Build Coastguard Worker
995b8a0653
Make change and version bump to UP1A.230616.001
...
Snap for 10331563 from d833e73b8b
to udc-release
Change-Id: I0a14f04c37c31e9003fdcf8a061886774df6171c
2023-06-15 23:46:44 +00:00
Lokesh Kumar Goel
12dda5360b
[automerger skipped] Update Security String to 2023-08-01 am: ba70ed836e
am: cbe67a8aff
am: c5dbf06e2b
-s ours am: ef9ac539af
-s ours
...
am skip reason: Merged-In I137506c673d9f44789c26f88a416c0fd06df02ce with SHA-1 be93b44331
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: I242f0b335dd1b626eca4efc9cb5ec754ed6bf2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:59:04 +00:00
Lokesh Kumar Goel
ef9ac539af
[automerger skipped] Update Security String to 2023-08-01 am: ba70ed836e
am: cbe67a8aff
am: c5dbf06e2b
-s ours
...
am skip reason: Merged-In I137506c673d9f44789c26f88a416c0fd06df02ce with SHA-1 be93b44331
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: Ie9f6f1725f194fd72d4108bc298abc136d2ba1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:18:11 +00:00
Lokesh Kumar Goel
d5b2847d66
[automerger skipped] Update Security String to 2023-08-01 am: ba70ed836e
am: cbe67a8aff
am: c76d2287b8
-s ours
...
am skip reason: Merged-In I137506c673d9f44789c26f88a416c0fd06df02ce with SHA-1 be93b44331
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: Ib98b5197ca5d87d4804fdd3052f581c4cba71d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 22:14:41 +00:00
Lokesh Kumar Goel
c5dbf06e2b
Update Security String to 2023-08-01 am: ba70ed836e
am: cbe67a8aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: I84612da5004663747ac8e9d2148626e29dfcd69b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:34:30 +00:00
Lokesh Kumar Goel
c76d2287b8
Update Security String to 2023-08-01 am: ba70ed836e
am: cbe67a8aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: I31084e756b0f1fb63ec9d3271e9548a157b2e61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 21:33:43 +00:00
Lokesh Kumar Goel
cbe67a8aff
Update Security String to 2023-08-01 am: ba70ed836e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554874
Change-Id: Ia027c896c5facaf865df3ca3e69f3a591b37fdc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 20:43:38 +00:00
Android Build Coastguard Worker
1af97902ea
[coastguard skipped] Merge sparse cherrypicks from sparse-10235405-L65000000961314396 into udc-release.
...
COASTGUARD_SKIP: Ib3ccd3b6cdc9354a8cb68b39bad5ffc660b57b6e
Change-Id: I36baefbea8cb1985b548f2b254308837d87cf3e8
2023-06-15 18:49:16 +00:00
Android Build Coastguard Worker
c1cf0a51bf
Version bump to UP1A.230601.001.X1 [core/build_id.mk]
...
Change-Id: Ib3ccd3b6cdc9354a8cb68b39bad5ffc660b57b6e
2023-06-15 18:46:03 +00:00
Android Build Coastguard Worker
c9bb4a45e9
[coastguard skipped] Merge sparse cherrypicks from sparse-10315831-L63200000961290887 into udc-release.
...
COASTGUARD_SKIP: I1ed65afa0ee2d887d8313a7b4164cca08083299c
Change-Id: I89e90eecec6053bf609a0b02a3767c160791a792
2023-06-15 04:03:48 +00:00
Android Build Coastguard Worker
25051500da
Version bump to UP1A.230614.001.X1 [core/build_id.mk]
...
Change-Id: I1ed65afa0ee2d887d8313a7b4164cca08083299c
2023-06-15 03:59:27 +00:00
Android Build Coastguard Worker
576ed9dbe5
Make change and version bump to UP1A.230615.001
...
Snap for 10322758 from d833e73b8b
to udc-release
Change-Id: I8f7da2b8fa6edfee2f6b217717c779e515171c8e
2023-06-14 23:43:53 +00:00
Android Build Coastguard Worker
f517eaf063
Make change and version bump to UP1A.230614.001
...
Snap for 10314561 from d833e73b8b
to udc-release
Change-Id: I53bb74dd70fe6d88232db3aa3c896fa285345645
2023-06-13 23:45:09 +00:00
TreeHugger Robot
d833e73b8b
Merge changes from topic "cherrypicker-L60200000961213913:N41200001377797274" into udc-dev
...
* changes:
Avoid using soong_zip's "-e" flag for boot.zip.
Add mainline extension and METADATA.txt to boot.zip.
2023-06-13 14:28:56 +00:00
Android Build Coastguard Worker
6477a4dff3
Version bump to UP1A.230613.002 [core/build_id.mk]
...
Change-Id: I295de71f355a1fe014500b1cd065f34bffa47e29
2023-06-13 06:24:06 +00:00
Android Build Coastguard Worker
a5702f7d4e
[coastguard skipped] Merge sparse cherrypicks from sparse-10289643-L65700000961235159 into udc-release.
...
COASTGUARD_SKIP: I3caf6affab175f17308b9e3c1501e0dcf36fe888
Change-Id: I45bf2b28c9fa50db955e4a7c1a57105b64b56c67
2023-06-13 06:12:57 +00:00
Android Build Coastguard Worker
7c55ae02f1
Version bump to UP1A.230609.002.A1 [core/build_id.mk]
...
Change-Id: I3caf6affab175f17308b9e3c1501e0dcf36fe888
2023-06-13 06:06:09 +00:00
Android Build Coastguard Worker
ee881b9b1a
Make change and version bump to UP1A.230613.001
...
Snap for 10306978 from 91183a7c54
to udc-release
Change-Id: I5733da9b05f7b5708174b3c0f6a102288d002d2e
2023-06-12 23:47:33 +00:00
Lokesh Kumar Goel
91183a7c54
Update Security String to 2023-08-05 am: be93b44331
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23556019
Change-Id: I8098f2a65f8e7b3d8aa42aefe4aa98cdaaaf5ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-12 18:30:56 +00:00
Jiakai Zhang
c63a2b36d7
Avoid using soong_zip's "-e" flag for boot.zip.
...
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC.
It uses soong_zip's "-e" flag to specify the filename to use in boot.zip
for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This
change uses an alternative approach to avoid using the "-e" flag.
Before this change, the contents were written to
out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to
rename to file to "METADATA.txt".
After this change, the contents are written to
out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to
remove the directory name.
Bug: 286381070
Test: m dist out/dist/boot.zip (on udc-dev)
(cherry picked from https://android-review.googlesource.com/q/commit:34914f620bcc0339104ef0360f6a30492f407409 )
Merged-In: I769de5194b5716f05e5352f4efd635a70ba0b891
Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
2023-06-12 16:28:51 +00:00
Jiakai Zhang
dac9d66a75
Add mainline extension and METADATA.txt to boot.zip.
...
Contents of METADATA.txt:
booclasspath = dex_bootjars_input/core-oj.jar:dex_bootjars_input/core-libart.jar:dex_bootjars_input/okhttp.jar:dex_bootjars_input/bouncycastle.jar:dex_bootjars_input/apache-xml.jar:dex_bootjars_input/framework.jar:dex_bootjars_input/framework-graphics.jar:dex_bootjars_input/ext.jar:dex_bootjars_input/telephony-common.jar:dex_bootjars_input/voip-common.jar:dex_bootjars_input/ims-common.jar:dex_bootjars_input/core-icu4j.jar:apex_bootjars/framework-adservices.jar:apex_bootjars/framework-sdksandbox.jar:apex_bootjars/framework-appsearch.jar:apex_bootjars/framework-bluetooth.jar:apex_bootjars/conscrypt.jar:apex_bootjars/android.net.ipsec.ike.jar:apex_bootjars/updatable-media.jar:apex_bootjars/framework-mediaprovider.jar:apex_bootjars/framework-ondevicepersonalization.jar:apex_bootjars/framework-statsd.jar:apex_bootjars/framework-permission.jar:apex_bootjars/framework-permission-s.jar:apex_bootjars/framework-scheduling.jar:apex_bootjars/framework-sdkextensions.jar:apex_bootjars/framework-connectivity.jar:apex_bootjars/framework-connectivity-t.jar:apex_bootjars/framework-tethering.jar:apex_bootjars/framework-uwb.jar:apex_bootjars/framework-virtualization.jar:apex_bootjars/framework-wifi.jar
booclasspath-locations = /apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/framework-graphics.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/apex/com.android.i18n/javalib/core-icu4j.jar:/apex/com.android.adservices/javalib/framework-adservices.jar:/apex/com.android.adservices/javalib/framework-sdksandbox.jar:/apex/com.android.appsearch/javalib/framework-appsearch.jar:/apex/com.android.btservices/javalib/framework-bluetooth.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.ipsec/javalib/android.net.ipsec.ike.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.permission/javalib/framework-permission-s.jar:/apex/com.android.scheduling/javalib/framework-scheduling.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.tethering/javalib/framework-connectivity.jar:/apex/com.android.tethering/javalib/framework-connectivity-t.jar:/apex/com.android.tethering/javalib/framework-tethering.jar:/apex/com.android.uwb/javalib/framework-uwb.jar:/apex/com.android.virt/javalib/framework-virtualization.jar:/apex/com.android.wifi/javalib/framework-wifi.jar
boot-image = system/framework/boot.art:system/framework/boot-framework-adservices.art
Bug: 286381070
Test: m dist out/dist/boot.zip
(cherry picked from https://android-review.googlesource.com/q/commit:a5551c5d91ce236e775bfc61fb3d6b7cdeb07b50 )
Merged-In: I258479ffbdf199091290b074329ff1b43db2e669
Change-Id: I258479ffbdf199091290b074329ff1b43db2e669
2023-06-12 16:28:18 +00:00
Android Build Coastguard Worker
3151000d66
Make change and version bump to UP1A.230612.001
...
Snap for 10302109 from 4c5aca71c4
to udc-release
Change-Id: I2ab6fb64c6331f2d753887fade0941da7f1d5d7a
2023-06-11 23:47:26 +00:00
Android Build Coastguard Worker
139f166e77
Make change and version bump to UP1A.230611.001
...
Snap for 10300212 from 4c5aca71c4
to udc-release
Change-Id: Ide4f220c25daedf7c1e06fbbe6f64b49ee5a3204
2023-06-10 21:43:34 +00:00
Android Build Coastguard Worker
c420ab7926
Make change and version bump to UP1A.230610.001
...
Snap for 10296977 from 4c5aca71c4
to udc-release
Change-Id: I3d696f9cddf744b536cf74afd7bb27261a080105
2023-06-10 01:47:42 +00:00
Android Build Coastguard Worker
a5fb2fa165
Version bump to UP1A.230609.002 [core/build_id.mk]
...
Change-Id: Ia4c88e409ad13ea179bd7f6dec801294bada87ee
2023-06-09 02:53:14 +00:00
Android Build Coastguard Worker
60bb30b53e
Make change and version bump to UP1A.230609.001
...
Snap for 10286161 from 4c5aca71c4
to udc-release
Change-Id: I73552ea1d73a7e48ef6f138f112070cf7d4eb0ba
2023-06-08 23:43:39 +00:00
Android Build Coastguard Worker
55c6baf193
[coastguard skipped] Merge sparse cherrypicks from sparse-10247062-L58100000961151739 into udc-release.
...
COASTGUARD_SKIP: I92fba58164d544d9b1f7a8d16c4c85d24bcb8a55
Change-Id: I72ec907c251f76f7549a7041d751bf0ed85953b3
2023-06-08 05:41:21 +00:00
Android Build Coastguard Worker
e6d5c3d808
Version bump to UP1A.230602.003.A1 [core/build_id.mk]
...
Change-Id: I92fba58164d544d9b1f7a8d16c4c85d24bcb8a55
2023-06-08 05:38:06 +00:00
Android Build Coastguard Worker
be3fd7ac7b
Make change and version bump to UP1A.230608.001
...
Snap for 10277839 from 4c5aca71c4
to udc-release
Change-Id: I2f4dfac3af4b0833b73e1a035484682c726dca8f
2023-06-07 23:43:33 +00:00
Android Build Coastguard Worker
3624afb59b
[coastguard skipped] Merge sparse cherrypicks from sparse-10263507-L86000000961122728 into udc-release.
...
COASTGUARD_SKIP: Ifb61f3315e615ddc620e5da8d74b2045cdad9fce
Change-Id: Id67997a01dd7d94cb31102c748be07885d90d24f
2023-06-07 06:26:50 +00:00
Android Build Coastguard Worker
3d8a6b73a2
Version bump to UP1A.230606.001.X1 [core/build_id.mk]
...
Change-Id: Ifb61f3315e615ddc620e5da8d74b2045cdad9fce
2023-06-07 06:22:41 +00:00
Android Build Coastguard Worker
566d9b24ca
Make change and version bump to UP1A.230607.001
...
Snap for 10269577 from 4c5aca71c4
to udc-release
Change-Id: Ic13984b14abb05cea8a1e5a4e032c616504d90ad
2023-06-06 23:44:47 +00:00
Dennis Shen
4c5aca71c4
Create otatools build target with dist am: fa04b8d7ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23566986
Change-Id: I9d6aa1103997d0c9ca42679dda3a74cc590def21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 12:57:04 +00:00