Commit Graph

191 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
6282215c69 Snap for 12378824 from ba31cb9d42 to 24Q4-release
Change-Id: I1a2e3b88007f5426bc56181d3f7d2aedfee60d39
2024-09-17 23:02:21 +00:00
Andrew Chant
ba31cb9d42 sepolicy: Allow vendor_init to set vendor_bluetooth_prop
Per DeviceBootTest.SELinuxUncheckedDenialBootTest:

09-17 16:22:22.968     1     1 I auditd  : type=1107 audit(0.0:4): uid=0 auid=4294967295 ses=4294967295 subj=u:r:init:s0 msg='avc:  denied  { set } for property=persist.vendor.service.bdroid.soclog pid=1 uid=0 gid=0 scontext=u:r:vendor_init:s0 tcontext=u:object_r:vendor_bluetooth_prop:s0 tclass=property_service permissive=0'
09-17 16:22:22.968     1     1 I auditd  : type=1107 audit(0.0:5): uid=0 auid=4294967295 ses=4294967295 subj=u:r:init:s0 msg='avc:  denied  { set } for property=persist.vendor.service.bdroid.fwsnoop pid=1 uid=0 gid=0 scontext=u:r:vendor_init:s0 tcontext=u:object_r:vendor_bluetooth_prop:s0 tclass=property_service permissive=0'
09-17 16:22:22.968     1     1 I auditd  : type=1107 audit(0.0:4): uid=0 auid=4294967295 ses=4294967295 subj=u:r:init:s0 msg='avc:  denied  { set } for property=persist.vendor.service.bdroid.soclog pid=1 uid=0 gid=0 scontext=u:r:vendor_init:s0 tcontext=u:object_r:vendor_bluetooth_prop:s0 tclass=property_service permissive=0'
09-17 16:22:22.968     1     1 I auditd  : type=1107 audit(0.0:5): uid=0 auid=4294967295 ses=4294967295 subj=u:r:init:s0 msg='avc:  denied  { set } for property=persist.vendor.service.bdroid.fwsnoop pid=1 uid=0 gid=0 scontext=u:r:vendor_init:s0 tcontext=u:object_r:vendor_bluetooth_prop:s0 tclass=property_service permissive=0'

Test: SELinuxUncheckedDenialBootTest
Bug: 366314934
Flag: EXEMPT bugFix
Change-Id: I1710044f4f79a73818fcb55a97ea6b3d826aea1f
2024-09-17 10:20:19 -07:00
Android Build Coastguard Worker
7f9b8145ea Snap for 12342105 from d7525ba274 to 24Q4-release
Change-Id: I88104677f5d0572acdd521fbef5794d3a77a3074
2024-09-09 23:02:08 +00:00
Vic Huang
d7525ba274 Add sepolicy for property persist.vendor.service.bdroid.
avc:  denied  { set } for property=persist.vendor.service.bdroid.bdaddr pid=860 uid=1002 gid=1002 scontext=u:r:hal_bluetooth_default:s0 tcontext=u:object_r:vendor_default_prop:s0 tclass=property_service permissive=0

Bug: 359428216
Test: Forest build
Flag: EXEMPT N/A
Change-Id: Iee12fc870810c0919593745487f57eb5fb8fde9c
2024-09-05 07:43:01 +00:00
Android Build Coastguard Worker
d50ccd7a28 Snap for 12272146 from a006f1b9b2 to 24Q4-release
Change-Id: I80333ac3888aade1ff9c8e7166380da6195d531a
2024-08-24 01:01:56 +00:00
Wilson Sung
a006f1b9b2 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 361726059
Test: scanBugreport
Bug: 361725767
Bug: 359428463
Test: scanAvcDeniedLogRightAfterReboot
Bug: 359428463
Flag: EXEMPT bugFix
Change-Id: I1bb0f8713a0a8d44564363f4774f3c893824bc82
2024-08-23 09:46:23 +00:00
Android Build Coastguard Worker
7f996d384a Snap for 12224018 from 5b3ea20991 to 24Q4-release
Change-Id: Ie1aff181c4308d3dca642a256257c8b18026779a
2024-08-13 23:02:34 +00:00
Wilson Sung
5b3ea20991 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 359428216
Test: scanBugreport
Bug: 359428463
Test: scanAvcDeniedLogRightAfterReboot
Bug: 359428217
Flag: EXEMPT bugFix
Change-Id: I1ebbc37e75df1348f57e5c4aaad67b28babc2461
2024-08-13 08:52:02 +00:00
Android Build Coastguard Worker
e463a4fbd5 Snap for 12205827 from 29c8930e79 to 24Q4-release
Change-Id: I84214bd294b24439eb86bda8b6a01d211dcba5d0
2024-08-09 01:01:50 +00:00
Vic Huang
29c8930e79 Add sepolicy for property persist.vendor.service.bdroid.
avc:  denied  { set } for property=persist.vendor.service.bdroid.bdaddr pid=860 uid=1002 gid=1002 scontext=u:r:hal_bluetooth_default:s0 tcontext=u:object_r:vendor_default_prop:s0 tclass=property_service permissive=0

Bug: 357483837
Test: Forest build
Flag: EXEMPT N/A
Change-Id: I18e092be0e352071fc1d3a68796d458a0bb4b704
2024-08-07 06:29:02 +00:00
Android Build Coastguard Worker
975a1a3dba Snap for 12185670 from 86598718d8 to 24Q4-release
Change-Id: I866028a1144fb606bd478576c69537401fade2e2
2024-08-05 23:02:05 +00:00
Wilson Sung
86598718d8 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 357483837
Flag: EXEMPT N/A
Change-Id: I709d2f212ad6328a045ee4472c3a7d4e855ff034
2024-08-05 06:07:28 +00:00
Android Build Coastguard Worker
b875c7530f Snap for 11987757 from b55914819e to 24Q4-release
Change-Id: I645f4a355ef4ed7264340470bc38b148a75da625
2024-06-18 23:02:26 +00:00
Xin Li
b55914819e [automerger skipped] Mark ab/11976889 as merged in aosp-main-future am: 732976fdcb -s ours
am skip reason: Merged-In If475169f02542c00285b99eda7feb27e2863597b with SHA-1 4f4cb10b69 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/27904816

Change-Id: Ia0294a9b5e5c8c21ee182f8341ecd40c42948fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 21:26:00 +00:00
Xin Li
732976fdcb Mark ab/11976889 as merged in aosp-main-future
Bug: 347831320
Merged-In: If475169f02542c00285b99eda7feb27e2863597b
Change-Id: I837a9d845cf5fb1ac2f9327a7b7c0f908b185075
2024-06-18 11:43:22 -07:00
Xin Li
dc647c97fd [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 21a8e729e2 -s ours am: 4f4cb10b69 -s ours
am skip reason: Merged-In I43a6fd2663279ba9e17825f341b230e6033e49b6 with SHA-1 dca29d91ee is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/3132077

Change-Id: I3f1cab5f51cdb2fb8b184b2f09b7c602ccc6369a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:58 +00:00
Xin Li
4f4cb10b69 [automerger skipped] Merge Android 14 QPR3 to AOSP main am: 21a8e729e2 -s ours
am skip reason: Merged-In I43a6fd2663279ba9e17825f341b230e6033e49b6 with SHA-1 dca29d91ee is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/3132077

Change-Id: If475169f02542c00285b99eda7feb27e2863597b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:42:06 +00:00
Xin Li
21a8e729e2 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In: I43a6fd2663279ba9e17825f341b230e6033e49b6
Change-Id: I6f1776f76c9915f3a6839399ae9964346217a610
2024-06-13 10:48:32 -07:00
Android Build Coastguard Worker
b40cbc9dfd Snap for 11915075 from 51768b048d to 24Q4-release
Change-Id: I5e802bf16a351abc612bf94c4ca2b9d9711e4518
2024-06-01 01:02:20 +00:00
Xin Li
51768b048d [automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: dca29d91ee -s ours
am skip reason: Merged-In I8d204e099f7a37422259c0ccac2bf25a082c2fcf with SHA-1 1cce81f773 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/27273363

Change-Id: I292760cd6b217472c8343c70c136efbea25e76bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:49:13 +00:00
Xin Li
dca29d91ee Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I8d204e099f7a37422259c0ccac2bf25a082c2fcf
Change-Id: I43a6fd2663279ba9e17825f341b230e6033e49b6
2024-05-06 12:09:16 -07:00
Xin Li
0c46aa581e [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 701f79f70a -s ours am: 1f77b24e68 -s ours
am skip reason: Merged-In I52ab29bee9421643fca69cb423f577452487089b with SHA-1 0aae9b9770 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2989695

Change-Id: I1870d30dbc09b40a4c260848dce814b9f75c2345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 10:46:46 +00:00
Xin Li
1f77b24e68 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 701f79f70a -s ours
am skip reason: Merged-In I52ab29bee9421643fca69cb423f577452487089b with SHA-1 0aae9b9770 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2989695

Change-Id: Id518115715a4be9e01c54b1388ca30e30317af7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:21 +00:00
Xin Li
701f79f70a Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I52ab29bee9421643fca69cb423f577452487089b
Change-Id: Ie7fe5498663a1ca97adc34c2fb22240e13d22e57
2024-03-06 09:29:49 -08:00
Jacky Liu
1cce81f773 Update i2c device paths
Update i2c device paths with static bus numbers.
Remove entries which are already in gs201-sepolicy.

Bug: 323447554
Test: Boot to home
Change-Id: I8d204e099f7a37422259c0ccac2bf25a082c2fcf
2024-02-06 16:16:19 +00:00
Xin Li
75d49c4e50 [automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 0aae9b9770 -s ours
am skip reason: Merged-In I0d94aa3c766c2d98748f53223e45fdb32caa38ba with SHA-1 cadc3a71b6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/25974035

Change-Id: Ie06d124dd51d04dae4d977cd3756a88640728349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:03:35 +00:00
Xin Li
0aae9b9770 Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I0d94aa3c766c2d98748f53223e45fdb32caa38ba
Change-Id: I52ab29bee9421643fca69cb423f577452487089b
2024-01-17 22:12:43 -08:00
Jenny Ho
fe3d38fe37 sepolicy: lynx: add wireless path permission
I auditd  : type=1400 audit(0.0:4402): avc:  denied  { read } for  comm="UeventThread" name="voltage_now" dev="sysfs" ino=66900 scontext=u:r:hal_wireless_charger:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=0
I auditd  : type=1400 audit(0.0:3924): avc:  denied  { read } for  comm="binder:531_2" name="wakeup82" dev="sysfs" ino=83487 scontext=u:r:system_suspend:s0 tcontext=u:object_r:sysfs_batteryinfo:s0 tclass=dir permissive=0

Bug: 320193504
Change-Id: I98e3c48f9c6eaaab2d303721bdb473fc72884738
Signed-off-by: Jenny Ho <hsiufangho@google.com>
2024-01-16 13:44:37 +08:00
Limon Mia
8e6298f772 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 318453067
Change-Id: Ifd636317f28da1b2ca12a417de7443780eba7b2d
2024-01-04 04:40:48 +00:00
Xin Li
b687697ad7 [automerger skipped] Merge Android 14 QPR1 am: c6b1b5c842 -s ours am: 2cfa970d9a -s ours am: 787ab9e582 -s ours
am skip reason: Merged-In Ia650fa0488bceb92c65c22278da30c2cc046e74c with SHA-1 26ba2b8247 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2865150

Change-Id: I3ed6c0e8622d117762c01c0f1794185124b257c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:54 +00:00
Xin Li
787ab9e582 [automerger skipped] Merge Android 14 QPR1 am: c6b1b5c842 -s ours am: 2cfa970d9a -s ours
am skip reason: Merged-In Ia650fa0488bceb92c65c22278da30c2cc046e74c with SHA-1 26ba2b8247 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2865150

Change-Id: I2c4142e6668537ce68f064cd76b8be11b04cd485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:41 +00:00
Xin Li
2cfa970d9a [automerger skipped] Merge Android 14 QPR1 am: c6b1b5c842 -s ours
am skip reason: Merged-In Ia650fa0488bceb92c65c22278da30c2cc046e74c with SHA-1 26ba2b8247 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2865150

Change-Id: I507e8a8ff38ba6a9f18882fa0f0360401116c7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:51 +00:00
Xin Li
c6b1b5c842 Merge Android 14 QPR1
Merged-In: Ia650fa0488bceb92c65c22278da30c2cc046e74c
Bug: 315507370
Change-Id: I5cbe1a4bb0ba5a3305716eace524c75cf393f9bf
2023-12-08 13:13:32 -08:00
Hsiu-Chang Chen
cadc3a71b6 wifi: genfs_contexts: fix path for wifi device
Bug: 313754855
Test: without avc denial when booting
Change-Id: I0d94aa3c766c2d98748f53223e45fdb32caa38ba
2023-12-04 15:37:05 +08:00
Xin Li
f10b2a6a41 [automerger skipped] Merge 10952656 am: 26ba2b8247 -s ours am: 9391249b9e -s ours
am skip reason: Merged-In Idcbaa090acede3f76d10ae93a29c035285e1f9f4 with SHA-1 1469be0c68 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/25089436

Change-Id: I6995e7876c686e73ca60bb44a50150666714bbb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:55 +00:00
Xin Li
9391249b9e [automerger skipped] Merge 10952656 am: 26ba2b8247 -s ours
am skip reason: Merged-In Idcbaa090acede3f76d10ae93a29c035285e1f9f4 with SHA-1 1469be0c68 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/25089436

Change-Id: Iaa11dffc9c536237163cad7ea493f4c277953ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:09 +00:00
Xin Li
26ba2b8247 Merge 10952656
Merged-In: Idcbaa090acede3f76d10ae93a29c035285e1f9f4
Change-Id: Ia650fa0488bceb92c65c22278da30c2cc046e74c
2023-10-17 10:06:41 -07:00
Wilson Sung
fe5397ebc7 Update SELinux error
Test: SELinuxUncheckedDenialBootTest
Bug: 305600996
Bug: 305600635
Bug: 305600791
Change-Id: I0ec67adb8fab1f8121313a47d47667dea1ff83b7
2023-10-16 06:01:18 +00:00
Xin Li
2eee63a4db [automerger skipped] Merge Android 14 am: d056d3bad8 -s ours am: f4c66c7adc -s ours am: 01481beac4 -s ours am: ff02510f63 -s ours am: 1469be0c68 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2774998

Change-Id: I53bf5073acae37d0816c2d06654fdbda9f03d33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:20:36 +00:00
Xin Li
1469be0c68 [automerger skipped] Merge Android 14 am: d056d3bad8 -s ours am: f4c66c7adc -s ours am: 01481beac4 -s ours am: ff02510f63 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2774998

Change-Id: Idcbaa090acede3f76d10ae93a29c035285e1f9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:01:06 +00:00
Xin Li
ff02510f63 [automerger skipped] Merge Android 14 am: d056d3bad8 -s ours am: f4c66c7adc -s ours am: 01481beac4 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2774998

Change-Id: I86c4de393c77ca8f5cfa5f7956ed6e788184f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:51:15 +00:00
Xin Li
01481beac4 [automerger skipped] Merge Android 14 am: d056d3bad8 -s ours am: f4c66c7adc -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2774998

Change-Id: I25dfa5694a087c404dbb2b72a584169661693d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:36 +00:00
Xin Li
f4c66c7adc [automerger skipped] Merge Android 14 am: d056d3bad8 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx-sepolicy/+/2774998

Change-Id: I09a3c4960de9a2d56de59f46a4f4be5acf2bdb2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:35 +00:00
Xin Li
d056d3bad8 Merge Android 14
Bug: 298295554
Merged-In: I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a
Change-Id: I276b153bbf5f86e9b9add8ed2fa2596a5d99e064
2023-10-05 15:34:03 -07:00
Xin Li
918ef34b5a [automerger skipped] Merge Android U (ab/10368041) am: c113fdf791 -s ours am: 69a5aaa440 -s ours am: a3f5e16590 -s ours am: 67564b940b -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/24182605

Change-Id: Ifb0fd263955e2d97322ccef37b9633a27376917e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:38:30 +00:00
Xin Li
67564b940b [automerger skipped] Merge Android U (ab/10368041) am: c113fdf791 -s ours am: 69a5aaa440 -s ours am: a3f5e16590 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/24182605

Change-Id: Id76e94794080cc2f7f11c1d512fa1926dfac5a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:11:24 +00:00
Xin Li
a3f5e16590 [automerger skipped] Merge Android U (ab/10368041) am: c113fdf791 -s ours am: 69a5aaa440 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/24182605

Change-Id: If1a4ed70ed9ad67d097bfd9cac68c32ff1049e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:41 +00:00
Xin Li
69a5aaa440 [automerger skipped] Merge Android U (ab/10368041) am: c113fdf791 -s ours
am skip reason: Merged-In I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a with SHA-1 c1c6e069f6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/24182605

Change-Id: Iffc17cca35d9570c24ea6a18bcf511c22826ce34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:41 +00:00
Xin Li
c113fdf791 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I2690bcd7b3ae0d869f39851d5fb692378cbb6e9a
Change-Id: I753ecee6f15989eb1199dbca03fc9aa8d66fecc7
2023-08-14 15:34:09 -07:00
Vic Huang
61794b4246 L10 sepolicy update for ssr coredump am: 378e0dc8e3 am: 244bc957ed
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx-sepolicy/+/24194244

Change-Id: Ib1796372e95175bbbc886c9b6e4353ecbff22a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 13:06:52 +00:00