Tri Vo
c15a4ae32b
Merge "Updated confirmationui HAL binary name." am: 5b81f62700
am: 61fac0d61a
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2251759
Change-Id: Ibdc4235e0eddf452922dd0304117bb04b5b2ff56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20 17:53:16 +00:00
Tri Vo
61fac0d61a
Merge "Updated confirmationui HAL binary name." am: 5b81f62700
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2251759
Change-Id: I39f8ef135703c75ae7487fb5ea32e3deee9baf79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20 17:07:32 +00:00
Tri Vo
5b81f62700
Merge "Updated confirmationui HAL binary name."
2022-10-20 16:51:56 +00:00
Chungjui Fan
8753d9d07c
sepolicy: gs101: allow fastbootd to access gsc device node am: 8d802db37a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/20210023
Change-Id: Ic59f5c3967ba09506234161c7a0058b40642851e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 12:31:55 +00:00
Chungjui Fan
8d802db37a
sepolicy: gs101: allow fastbootd to access gsc device node
...
avc: denied { getattr } for pid=469 comm="fastbootd"
path="/dev/gsc0" dev="tmpfs" ino=470 scontext=u:r:fastbootd:s0
tcontext=u:object_r:citadel_device:s0
tclass=chr_file permissive=0
Bug: 248301125
Change-Id: Ic1aec8874636437b9b8d795b46fae72fa8533302
Signed-off-by: Chungjui Fan <chungjuifan@google.com>
2022-10-17 12:26:10 +00:00
Krzysztof Kosiński
a110b52215
Use generic wildcard for vendor libprotobuf. am: 2118dfb684
am: f9f745da33
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2255496
Change-Id: I642062447d3e11a152fcead3689cbd1017c97e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 16:22:16 +00:00
Krzysztof Kosiński
f9f745da33
Use generic wildcard for vendor libprotobuf. am: 2118dfb684
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2255496
Change-Id: I3788ebba42c38f754c183eb518e2d3a9ad31bba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 15:51:58 +00:00
Krzysztof Kosiński
2118dfb684
Use generic wildcard for vendor libprotobuf.
...
The suffix changes on each upgrade and the newest release uses
a two-part version number instead of a three-part one. Use a regex
that will match any suffix.
Bug: 203713560
Test: presubmit, log check
Change-Id: I27d7bd10e469b794226fe0c77b02c57d876729b1
2022-10-14 14:06:56 +00:00
Rajesh Nyamagoud
ff0d3717a6
Updated confirmationui HAL binary name.
...
Ignore-AOSP-First: Dependent on internal change.
Bug: b/205760172
Test: Run confirmation UI test using CTS Verifier
Change-Id: I690f6eb49f47bdf2d2790b0a6c9b0c45ca819a31
2022-10-12 20:59:26 +00:00
Rajesh Nyamagoud
5de95a5dd9
Updated confirmationui HAL binary name.
...
Ignore-AOSP-First: Dependent on internal change.
Bug: b/205760172
Test: Run confirmation UI test using CTS Verifier
Change-Id: I690f6eb49f47bdf2d2790b0a6c9b0c45ca819a31
(cherry picked from commit 2acd1c0e73
)
Merged-In: I690f6eb49f47bdf2d2790b0a6c9b0c45ca819a31
2022-10-12 17:46:46 +00:00
Xin Li
d78be3af77
[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: b36d9e6b41
-s ours
...
am skip reason: Merged-In Icc3762cef7f9766d845f1e1a56af1315fc97163b with SHA-1 908a8fcf14
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/20136207
Change-Id: Iccc5debc1ad0b345d107b06e55f12b7156959515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:55:58 +00:00
Xin Li
b36d9e6b41
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
...
Bug: 248070379
Merged-In: Icc3762cef7f9766d845f1e1a56af1315fc97163b
Change-Id: Ic16e04d8670d4e1607d8c64c39cd6376aceed1ba
2022-10-06 12:00:25 -07:00
Jinting Lin
230b907ae1
Merge "Allows modem_svc to read the logging related properties" into tm-qpr-dev am: d255ed1576
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19967636
Change-Id: Ic7a7ec1e03af32e88989f32452c2c255e1419a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 15:35:53 +00:00
Jinting Lin
d255ed1576
Merge "Allows modem_svc to read the logging related properties" into tm-qpr-dev
2022-09-22 14:30:32 +00:00
Eden Su
4cb7381067
[automerger skipped] Merge changes from topic "gs101_network_access" into tm-qpr-dev am: c3c4aa626b
-s ours
...
am skip reason: Merged-In Id9ba79ba87010326c53b6aec408e5cdb291122a6 with SHA-1 09e0e1b280
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19771223
Change-Id: I9ba0932f49df3b5c042c5b3271dc41a2e1ecf6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 01:01:03 +00:00
Hana Kim
da15cf3c35
[automerger skipped] Sepolicy: add permission to allow create, connect udp socket am: 060b562310
-s ours
...
am skip reason: Merged-In Id9ba79ba87010326c53b6aec408e5cdb291122a6 with SHA-1 09e0e1b280
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19771223
Change-Id: I0ee313ca921ff8001ba64e7c0b38dc4551687aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 01:01:02 +00:00
Eden Su
c3c4aa626b
Merge changes from topic "gs101_network_access" into tm-qpr-dev
...
* changes:
Sepolicy: add permission to allow create, connect udp socket
sepolicy: gs101: allowed permissions required for network access
2022-09-20 00:34:18 +00:00
jintinglin
9a4545eafa
Allows modem_svc to read the logging related properties
...
avc: denied { read } for comm="modem_svc_sit" name="u:object_r:vendor_logger_prop:s0" dev="tmpfs" ino=347 scontext=u:r:modem_svc_sit:s0 tcontext=u:object_r:vendor_logger_prop:s0 tclass=file permissive=0
Bug: 243039758
Change-Id: I80a6971a2c3e09320e780d1eff24e040cd8b3541
2022-09-19 05:31:09 +00:00
Hana Kim
060b562310
Sepolicy: add permission to allow create, connect udp socket
...
Bug: 226412527
Test: The tester verified IMS didn't crash and no avc denied log
Signed-off-by: Hana Kim <hanaa.kim@samsung.com>
Change-Id: Id9ba79ba87010326c53b6aec408e5cdb291122a6
Merged-In: Id9ba79ba87010326c53b6aec408e5cdb291122a6
2022-09-19 04:58:00 +00:00
Jinhee Kim
fd941e1c1a
sepolicy: gs101: allowed permissions required for network access am: 653e53d11d
am: 9ca55393c9
am: a62f7495fb
am: 11149a00ca
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2214621
Change-Id: Iee88f3f9d98f1b1f1568613b81542560e42ee25d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 12:18:57 +00:00
Hana Kim
a29b3c8ca1
Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280
am: 6c17e1e6f5
am: 19e9846ba8
am: 6b1cbfe260
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444
Change-Id: I50d573cc65874987be884d83b72f4aaaa71c8818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 12:18:56 +00:00
Jinhee Kim
11149a00ca
sepolicy: gs101: allowed permissions required for network access am: 653e53d11d
am: 9ca55393c9
am: a62f7495fb
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2214621
Change-Id: I1da45f9173b7812ab45d8b503af446689a2e7fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 11:49:03 +00:00
Hana Kim
6b1cbfe260
Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280
am: 6c17e1e6f5
am: 19e9846ba8
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444
Change-Id: I9074a2aaab6ef1916fc3fa9a0c1f3e5e3fe610a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 11:49:01 +00:00
Jinhee Kim
a62f7495fb
sepolicy: gs101: allowed permissions required for network access am: 653e53d11d
am: 9ca55393c9
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2214621
Change-Id: Ib062d4ee9a01a39c1b8db50b4bd47c45ed8f2fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:54:14 +00:00
Hana Kim
19e9846ba8
Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280
am: 6c17e1e6f5
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444
Change-Id: I0ea2a78c506c360ac10958b08304c6b62167946b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:54:11 +00:00
Jinhee Kim
9ca55393c9
sepolicy: gs101: allowed permissions required for network access am: 653e53d11d
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2214621
Change-Id: Icc54f4ea60062d0b56ac88692803b1171e8fb345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:26:20 +00:00
Hana Kim
6c17e1e6f5
Sepolicy: add permission to allow create, connect udp socket am: 09e0e1b280
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2200444
Change-Id: I929947f0b0ee7c969530343fd779fb88a411a7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 10:26:19 +00:00
Jinhee Kim
908a8fcf14
sepolicy: gs101: allowed permissions required for network access
...
avc: denied { write } for comm="Thread-102" name="dnsproxyd" dev="tmpfs" ino=1022 scontext=u:r:vendor_ims_app:s0:c251,c256,c512,c768 tcontext=u:object_r:dnsproxyd_socket:s0 tclass=sock_file permissive=0 app=com.shannon.imsservice
avc: denied { node_bind } for comm="Thread-102" src=50174 scontext=u:r:vendor_ims_app:s0:c251,c256,c512,c768 tcontext=u:object_r:node:s0 tclass=udp_socket permissive=0 app=com.shannon.imsservice
Bug: 242231557
Test: The tester verified IMS didn't crash and no avc denied log
Change-Id: Icc3762cef7f9766d845f1e1a56af1315fc97163b
Signed-off-by: Jinhee Kim <jinhee.k@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Merged-In: Icc3762cef7f9766d845f1e1a56af1315fc97163b
2022-09-16 08:51:52 +00:00
Estefany Torres
899574b2d8
Merge "Add rules for letting logger app send the command to ril" into tm-qpr-dev am: 0ec93ed8cd
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19912324
Change-Id: I14947b4a9dc41ffdb9afef580597ee0d4798443f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 14:35:07 +00:00
Estefany Torres
0ec93ed8cd
Merge "Add rules for letting logger app send the command to ril" into tm-qpr-dev
2022-09-15 14:09:07 +00:00
TreeHugger Robot
a106f636f8
Merge "aoc: add audio property for pixellogger update control" into tm-qpr-dev am: 75f908a8ed
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19533964
Change-Id: I347bbb35b216896a87b3b2edc96af57d6dadfe80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 02:23:57 +00:00
TreeHugger Robot
75f908a8ed
Merge "aoc: add audio property for pixellogger update control" into tm-qpr-dev
2022-09-14 01:48:40 +00:00
Jinhee Kim
653e53d11d
sepolicy: gs101: allowed permissions required for network access
...
avc: denied { write } for comm="Thread-102" name="dnsproxyd" dev="tmpfs" ino=1022 scontext=u:r:vendor_ims_app:s0:c251,c256,c512,c768 tcontext=u:object_r:dnsproxyd_socket:s0 tclass=sock_file permissive=0 app=com.shannon.imsservice
avc: denied { node_bind } for comm="Thread-102" src=50174 scontext=u:r:vendor_ims_app:s0:c251,c256,c512,c768 tcontext=u:object_r:node:s0 tclass=udp_socket permissive=0 app=com.shannon.imsservice
Bug: 242231557
Test: Build
Change-Id: Icc3762cef7f9766d845f1e1a56af1315fc97163b
Signed-off-by: Jinhee Kim <jinhee.k@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2022-09-12 15:18:32 +08:00
Hana Kim
09e0e1b280
Sepolicy: add permission to allow create, connect udp socket
...
Bug: 226412527
Test: Build
Signed-off-by: Hana Kim <hanaa.kim@samsung.com>
Change-Id: Id9ba79ba87010326c53b6aec408e5cdb291122a6
2022-09-12 15:17:44 +08:00
Estefany Torres
7b5ed95fdd
Add rules for letting logger app send the command to ril
...
08-31 23:40:57.354 458 458 E SELinux : avc: denied { find } for interface=vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal sid=u:r:logger_app:s0:c252,c256,c512,c768 pid=2901 scontext=u:r:logger_app:s0:c252,c256,c512,c768 tcontext=u:object_r:hal_exynos_rild_hwservice:s0 tclass=hwservice_manager permissive=0
09-01 00:08:19.600 2881 2881 W oid.pixellogger: type=1400 audit(0.0:10): avc: denied { call } for scontext=u:r:logger_app:s0:c252,c256,c512,c768 tcontext=u:r:rild:s0 tclass=binder permissive=0 app=com.android.pixellogger
Bug: 241412942
Test: tested in C10 with pixel logger change
Change-Id: Idcd693790d654d0a9b7aba46a41764d65867a61c
2022-09-09 17:35:19 +00:00
JJ Lee
479f2286d7
sepolicy: add nodes for aoc memory votes stats am: f07279785d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19739216
Change-Id: I795b972da3d42e7394fbd954f041934370fbd77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 05:16:23 +00:00
JJ Lee
f07279785d
sepolicy: add nodes for aoc memory votes stats
...
Bug: 223674292
Test: build pass, not blocking bugreport
Change-Id: I4732c8b3271f553edc423ac115eb8a6afaebff37
Signed-off-by: JJ Lee <leejj@google.com>
2022-09-07 11:45:18 +00:00
Roger Fang
5321008d5c
sepolicy: add permission for AMS rate of pixelstats-vend am: a8eab1aaaf
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19711052
Change-Id: I61f3cfbb14f0f34bf0af2eaba1922b9aed4b7948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 05:15:55 +00:00
Roger Fang
a8eab1aaaf
sepolicy: add permission for AMS rate of pixelstats-vend
...
I pixelstats-vend: type=1400 audit(0.0:1025): avc: denied { read } for name="ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1
I pixelstats-vend: type=1400 audit(0.0:1026): avc: denied { open } for path="/sys/devices/platform/audiometrics/ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1
pixelstats-vend: type=1400 audit(0.0:1027): avc: denied { getattr } for path="/sys/devices/platform/audiometrics/ams_rate_read_once" dev="sysfs" ino=79714 scontext=u:r:pixelstats_vendor:s0 tcontext=u:object_r:sysfs:s0 tclass=file permissive=1
Bug: 239508478
Test: Manually test passed
Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: I5c47003bed664f2cd9b6fe3630a6445aca27d10d
2022-08-30 04:36:41 +00:00
Robb Glasser
6ce1ff96e4
Give permissions to save usf stats and dump them in bugreports. am: 4b4afb2eea
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19672464
Change-Id: Iacf95664f2ba6bf126b82e2e2d73bddcddb70422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 03:38:27 +00:00
Robb Glasser
4b4afb2eea
Give permissions to save usf stats and dump them in bugreports.
...
Creating a mechanism to save some USF stat history to device and pipe it
to bugreports. Granting permissions so that this can work.
Bug: 242320914
Test: Stats save and are visible in a bugreport.
Change-Id: Ia1973800ed053f54da043d306e11c0a7b10132a7
2022-08-24 22:39:16 +00:00
Treehugger Robot
8a978f91ea
[automerger skipped] Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca
am: a4d246abac
am: 6481874c77
am: 4c9a910a60
-s ours
...
am skip reason: Merged-In I8600283d9ff2ebcb45df95e5259484a60921fb1a with SHA-1 c96220c282
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507
Change-Id: Ieeb614105a88c6dd27a46a49b2a2bff8d2252892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 08:13:18 +00:00
Treehugger Robot
4c9a910a60
Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca
am: a4d246abac
am: 6481874c77
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507
Change-Id: Ica06811653100886c99ea2d01ab09edfdd83585f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:46:49 +00:00
Treehugger Robot
6481874c77
Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca
am: a4d246abac
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507
Change-Id: Ib9ba46ae5b7e0454927f18e48a85f03f6847ef83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 07:29:18 +00:00
Treehugger Robot
a4d246abac
Merge "Add security context for com.google.usf.non_wake_up/wakeup." am: d6ff29d1ca
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183507
Change-Id: I89572f1c793f464011163d50c0ef19c95f3b13d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 06:59:40 +00:00
Treehugger Robot
d6ff29d1ca
Merge "Add security context for com.google.usf.non_wake_up/wakeup."
2022-08-22 06:38:52 +00:00
Treehugger Robot
e3fc764940
[automerger skipped] Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9
am: c56dc643a4
am: b2e001581b
am: b551e0475f
-s ours
...
am skip reason: Merged-In If9add3528bde47a618bd884ce28121b6fa32754c with SHA-1 bf1333f881
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506
Change-Id: I272afe3233e8fd5303271257613c45cc9d284e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 05:29:17 +00:00
Treehugger Robot
b551e0475f
Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9
am: c56dc643a4
am: b2e001581b
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506
Change-Id: I46122f6a44cb7bc4ea9fb1f63c4e57e8f92709f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 05:12:24 +00:00
Treehugger Robot
b2e001581b
Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9
am: c56dc643a4
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506
Change-Id: Ibd378b384da9da3b9a08c9d56e72ecc5b3fd8ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 04:44:16 +00:00
Treehugger Robot
c56dc643a4
Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." am: 3cb1ea79c9
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2183506
Change-Id: Id1cdbd151bd58bfca12ea328f749a54b54d4edb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22 04:24:22 +00:00