Commit graph

4583 commits

Author SHA1 Message Date
Bruno BELANYI
b4001ec206 Remove 'hal_neuralnetworks_armnn' sysprop exceptions
Bug: 205202540
Bug: 264489188
Test: manual - reboot device and check the absence of AVC denials
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4254a16aa516f5960f48732b078aad4ed63df6f)
Merged-In: Ied38dc6b323911aa909f4f42b66ee404fc7062fa
Change-Id: Ied38dc6b323911aa909f4f42b66ee404fc7062fa
2023-04-26 17:20:54 +00:00
Bruno BELANYI
a668555419 Add ArmNN config sysprops SELinux rules
Bug: 205202540
Bug: 264489188
Test: manual - reboot device and check the absence of AVC denials
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f99f3e63450befc661d38827e9afc853ca9257a)
Merged-In: I70c89dcc4b2bbe665d69cc4be1ac2f6cf8155a10
Change-Id: I70c89dcc4b2bbe665d69cc4be1ac2f6cf8155a10
2023-04-26 08:12:54 +00:00
Joseph Jang
66cf2fe626 Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a am: b7dc8e13de am: b1a89da7bb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I978294042e70452d6bb395bce07b12e7458f7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:32:07 +00:00
Joseph Jang
c7fb98359d Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a am: a086d7c588 am: ddb3354cf3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: Iffd408b3eb031dff9a4859c7831ab1cb6f26faaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 05:31:47 +00:00
Joseph Jang
b1a89da7bb Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a am: b7dc8e13de
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I07ace1bc29201483ce07dfacdc5ba87b0f327cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:54:27 +00:00
Joseph Jang
6883dda89f Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a am: 9a1381585b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I594436e85c134c72eb10be856524ba3500d7546b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:49:48 +00:00
Joseph Jang
ddb3354cf3 Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a am: a086d7c588
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I433c569b93e2957d88aa0a9762cb64394fb72005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:49:48 +00:00
Joseph Jang
a086d7c588 Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: Ie9d8e1f5a3c4e5dcfccbeda821cbd4d61bf71ad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:11:56 +00:00
Joseph Jang
9a1381585b Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I21399d89048707e65eb95ba5f13c84e7d9d8ede8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:11:52 +00:00
Joseph Jang
b7dc8e13de Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev am: 37e90d3f3a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22808538

Change-Id: I280f6280400602ee9ef6c980fcf8f645fd603368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:07:33 +00:00
Joseph Jang
37e90d3f3a Merge "Move recovery.te to device/google/gs-common/dauntless/sepolicy" into udc-dev 2023-04-26 03:24:40 +00:00
Joseph Jang
ac6f4e0d00 Move recovery.te to device/google/gs-common/dauntless/sepolicy
Bug: 279381809
Change-Id: If41449f97e729053caa98930cc7f2ef9fd6d844e
2023-04-24 08:09:23 +00:00
Adam Shih
30a1c8b3db [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 am: b515f71918 -s ours am: 06cde84564 -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 843b0ad6b4 is already in history

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

Change-Id: Ie6d764f25bdfaf865b34daebe2ed4645ecfe5f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 05:06:50 +00:00
Adam Shih
1511b8210a [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 -s ours am: 6adde197a2 -s ours am: d009fc203d -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 e10e338032 is already in history

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

Change-Id: I5a01dd5e5a641fba52453e812ec1b1f6580b955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 05:05:20 +00:00
Adam Shih
06cde84564 [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 am: b515f71918 -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 843b0ad6b4 is already in history

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

Change-Id: Ia2752e5dc50baf4156923439bfee1a9b92582161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 04:28:11 +00:00
Adam Shih
d009fc203d [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 -s ours am: 6adde197a2 -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 e10e338032 is already in history

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

Change-Id: Ifb88289c4b99ce3af6a95de51a451bb8a18f48d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 04:23:19 +00:00
Adam Shih
4668baa311 [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 am: 978f3f8dd8 -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 e10e338032 is already in history

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

Change-Id: I0d6c665bb6bb8155a4f832754d3d4d5ee26b7602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 04:23:16 +00:00
Adam Shih
978f3f8dd8 Update error on ROM 9930000 am: 843b0ad6b4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22802738

Change-Id: I54760d250e690390b9c0b1f8c58e63746eb661b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 03:45:31 +00:00
Adam Shih
6adde197a2 [automerger skipped] Update error on ROM 9930000 am: 843b0ad6b4 -s ours
am skip reason: Merged-In I38a3f852e2f5f0f6895db15141825909361a267d with SHA-1 e10e338032 is already in history

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

Change-Id: I215d23548ce4461fefe952cb42705409d5ab2885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 03:45:12 +00:00
Adam Shih
b515f71918 Update error on ROM 9930000 am: 843b0ad6b4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22802738

Change-Id: Id0a018e58bafe93b87e7c1ebdccabf389088cef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 03:42:59 +00:00
Adam Shih
843b0ad6b4 Update error on ROM 9930000
Bug: 277989397
Bug: 277155042
Bug: 277989067
Test: scanBugreport
Change-Id: I38a3f852e2f5f0f6895db15141825909361a267d
Merged-In: I38a3f852e2f5f0f6895db15141825909361a267d
2023-04-24 09:58:14 +08:00
Xin Li
10559c3fff [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 054c89fdad -s ours am: e0887325f5 -s ours am: ab04ca6af0 -s ours am: 74a28b39ad -s ours
am skip reason: Merged-In I1c9544ca2ebe1857c439f00c4589f739aca8e157 with SHA-1 893d8ddff7 is already in history

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

Change-Id: I806c69e43928464912bb78562151934d0c26f57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:52:50 +00:00
Xin Li
74a28b39ad [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 054c89fdad -s ours am: e0887325f5 -s ours am: ab04ca6af0 -s ours
am skip reason: Merged-In I1c9544ca2ebe1857c439f00c4589f739aca8e157 with SHA-1 893d8ddff7 is already in history

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

Change-Id: I849e460bc1c8245596cf8eb51fdcd7443c6ea182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:12:08 +00:00
Xin Li
ab04ca6af0 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 054c89fdad -s ours am: e0887325f5 -s ours
am skip reason: Merged-In I1c9544ca2ebe1857c439f00c4589f739aca8e157 with SHA-1 893d8ddff7 is already in history

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

Change-Id: I1c8a8f3601a437caed6423b08fa15c2c2aa937c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:34 +00:00
Xin Li
e0887325f5 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 054c89fdad -s ours
am skip reason: Merged-In I1c9544ca2ebe1857c439f00c4589f739aca8e157 with SHA-1 893d8ddff7 is already in history

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

Change-Id: I1b8a0ebbcf60fd773379708434a05452cf6d4d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:50 +00:00
Bruno BELANYI
347dfbe925 Remove 'hal_neuralnetworks_armnn' '/data' access exception
The mali driver has been configured not to look there anymore.

Bug: b/205779871
Test: manual - reboot device and check the absence of AVC denials
Change-Id: Ic8bf0d51414461689ee5768821a2a1acda923c41
2023-04-20 09:15:03 +00:00
Bruno BELANYI
40a1da28b5 Merge changes from topic "armnn-sysprops"
* changes:
  Remove 'hal_neuralnetworks_armnn' sysprop exceptions
  Add ArmNN config sysprops SELinux rules
2023-04-20 08:14:04 +00:00
Automerger Merge Worker
d9b12023d3 Merge "rild: allow rild to ptrace am: 26e3d2abd0 am: 66b15bfc3d" 2023-04-20 07:39:25 +00:00
jimsun
81d8f46ffc rild: allow rild to ptrace am: 26e3d2abd0 am: 66b15bfc3d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22122889

Change-Id: I05ff6ae42bc88804a76add8435fa79403c84bde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:39:03 +00:00
jimsun
f134649ff7 rild: allow rild to ptrace am: 26e3d2abd0 am: 7b6f60771c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22122889

Change-Id: Ief19acca77ce3b0cc65f62eb5cb2efd540c0d317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:38:54 +00:00
jimsun
7b6f60771c rild: allow rild to ptrace am: 26e3d2abd0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22122889

Change-Id: Ie95ac070579f4c3cf3cfcaf95e2d371dadc5610a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:01:15 +00:00
jimsun
66b15bfc3d rild: allow rild to ptrace am: 26e3d2abd0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22122889

Change-Id: I267cad762d71cdcd7e8f7038fbcf37bc0951ffe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 07:01:14 +00:00
Bruno BELANYI
e4254a16aa Remove 'hal_neuralnetworks_armnn' sysprop exceptions
Bug: b/205202540
Test: manual - reboot device and check the absence of AVC denials
Change-Id: Ied38dc6b323911aa909f4f42b66ee404fc7062fa
2023-04-19 11:31:03 +00:00
Bruno BELANYI
0f99f3e634 Add ArmNN config sysprops SELinux rules
Bug: b/205202540
Test: manual - reboot device and check the absence of AVC denials
Change-Id: I70c89dcc4b2bbe665d69cc4be1ac2f6cf8155a10
2023-04-19 11:31:00 +00:00
Xin Li
054c89fdad Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I1c9544ca2ebe1857c439f00c4589f739aca8e157
Change-Id: Ib7236e8f3c5929dd76ad1644511724d618821373
2023-04-18 16:32:08 -07:00
jimsun
26e3d2abd0 rild: allow rild to ptrace
06-20 18:47:41.940000  8708  8708 I auditd  : type=1400 audit(0.0:7): avc: denied { ptrace } for comm="libmemunreachab" scontext=u:r:rild:s0 tcontext=u:r:rild:s0 tclass=process permissive=0
06-20 18:47:41.940000  8708  8708 W libmemunreachab: type=1400 audit(0.0:7): avc: denied { ptrace } for scontext=u:r:rild:s0 tcontext=u:r:rild:s0 tclass=process permissive=0

Bug: 263757077
Test: manual
Change-Id: I35ad31e6cc4e2942c671e51720f28a9abce3dcca
2023-04-18 07:48:32 +00:00
Bruno BELANYI
f7df059d0d Merge "Use restricted vendor property for ARM runtime options" into udc-dev am: bf8675143b am: cb752d4cf4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22381263

Change-Id: Icf2a67e975e8da3abd533ae7c542f777b2e5f60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:57:00 +00:00
Bruno BELANYI
d1a1f4e167 Merge "Use restricted vendor property for ARM runtime options" into udc-dev am: bf8675143b am: f47334e3f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22381263

Change-Id: Id1b9cf7954cefe367954225896a708f2aade1e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:55:44 +00:00
Bruno BELANYI
cb752d4cf4 Merge "Use restricted vendor property for ARM runtime options" into udc-dev am: bf8675143b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22381263

Change-Id: I28dbee80bce314d62708983c9f848bb61a47b1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:29:24 +00:00
Bruno BELANYI
f47334e3f1 Merge "Use restricted vendor property for ARM runtime options" into udc-dev am: bf8675143b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22381263

Change-Id: Ic1621074f7b2281c3176467a33884acc12d2a5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:28:50 +00:00
Bruno BELANYI
bf8675143b Merge "Use restricted vendor property for ARM runtime options" into udc-dev 2023-04-17 10:59:23 +00:00
Treehugger Robot
cb29d1729a Merge "Update error on ROM 9930000" into udc-d1-dev am: f57e39a7a1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/22601619

Change-Id: I24c7525779db72feb6e3467fe2b26ed3db099d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 04:38:53 +00:00
Treehugger Robot
f57e39a7a1 Merge "Update error on ROM 9930000" into udc-d1-dev 2023-04-13 03:41:52 +00:00
Xin Li
8560661ab7 [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours am: 9505121ada -s ours am: ab4e3e986a -s ours am: 2714763638 -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: Icf2f33a2a4f266f086d4c91453ce75975bf2188d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 03:34:30 +00:00
Xin Li
0053db6a1e [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours am: 9505121ada -s ours am: ab4e3e986a -s ours am: 445c9786c6 -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: Ib16845f262525f276849f5e687087ce2b8072259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13 02:55:01 +00:00
Adam Shih
e10e338032 Update error on ROM 9930000
Bug: 277989397
Bug: 277155042
Bug: 277989067
Test: scanBugreport
Change-Id: I38a3f852e2f5f0f6895db15141825909361a267d
2023-04-13 10:15:11 +08:00
Xin Li
445c9786c6 [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours am: 9505121ada -s ours am: ab4e3e986a -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: I05d9347c773c51b55bbc622ac0f3f8d9652d5782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:13:18 +00:00
Xin Li
2714763638 [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours am: 9505121ada -s ours am: ab4e3e986a -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: Ia20b14fcd634184ff89e3760d75ef999d490f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 21:08:39 +00:00
Xin Li
ab4e3e986a [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours am: 9505121ada -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: I07cabb680ee2172a60bdc37f9a61a2af528844d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:57:06 +00:00
Xin Li
9505121ada [automerger skipped] Merge TQ2A.230405.003 am: 82232b6423 am: 26cfa34cb7 -s ours
am skip reason: Merged-In I8c265919f7ae4b18aa304b0a584536d2a0f4b27a with SHA-1 9828cc747a is already in history

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

Change-Id: Ie91202c445df25847c5bcd37cf8224e7bae6536e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:22:54 +00:00