Wei Wang
583a242d9b
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I8c55549d01528b33cbf4333930c4c4c0a8281e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:10:03 +00:00
Wei Wang
f041f70a21
allow udfps hal to access trusty am: 615f85c22d
am: daf2093583
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I90d58607416a0874ca4a80ecb46d902f8764e8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:50 +00:00
Wei Wang
b9f0680283
allow udfps hal to access trusty am: 615f85c22d
am: b94efeaff0
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I45576b46edad47a0614534f0a503a99036936e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 02:09:40 +00:00
Wei Wang
b94efeaff0
allow udfps hal to access trusty am: 615f85c22d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I021692200c0bc229f23d573685f1ca75c4fb0ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:15:56 +00:00
Wei Wang
daf2093583
allow udfps hal to access trusty am: 615f85c22d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17982120
Change-Id: I4d62137c19cbccd9ce294f2c34c40199b60e3b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 01:14:20 +00:00
Wei Wang
615f85c22d
allow udfps hal to access trusty
...
Bug: 229350721
Bug: 230492593
Test: UDFPS with stress
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ib1abe0e0318689528a6658f3597f1c11ad9fa1c3
2022-04-27 20:20:43 +00:00
Treehugger Robot
fd65b31055
Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2044871
Change-Id: Ib0ea1d39f90456062a1d18ac86ff8c6140cb29eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:39:58 +00:00
Treehugger Robot
c49520d66e
Merge "android.hardware.usb.IUsb AIDL migration"
2022-04-27 16:21:29 +00:00
Jenny Ho
15036785cf
sepolicy: allow access debugfs charger register dump
...
[ 438.549652] type=1400 audit(1651035282.616:8): avc: denied { read } for comm="dumpstate@1.1-s" name="registers" dev="debugfs" ino=31549 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:debugfs:s0 tclass=file permissive=0
[ 438.550252] type=1400 audit(1651035282.616:9): avc: denied { read } for comm="dumpstate@1.1-s" name="registers" dev="debugfs" ino=31532 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:debugfs:s0 tclass=file permissive=0
Bug: 230360103
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: I102a159ca23a65d99a52cac3d011f5ce535a37e7
2022-04-27 10:09:48 +00:00
Anthony Stange
8c311f981b
Update SELinux to allow CHRE to talk to the Wifi HAL
...
Bug: 206614765
Test: Run locally
Change-Id: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
Merged-In: I73bcf96ed1cab0a101e5f84852a1d82258b9c690
2022-04-27 06:13:14 +00:00
Edmond Chung
1859147fa3
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours am: bdd7f4ca53
-s ours am: d99f3881c6
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Iaa8dbe6c54273c3dab6c52cff2bccf75a1a70ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:38:31 +00:00
Edmond Chung
d99f3881c6
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours am: bdd7f4ca53
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Ic110cb2ce1580b19d6acb94a6f7d2e3d02595c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 21:15:49 +00:00
Edmond Chung
bdd7f4ca53
[automerger skipped] Camera: add setsched capability. am: 99b4aebb6a
am: a287bef991
-s ours
...
am skip reason: Merged-In Ifbf433c026549ca774a9521704d0b0b75c9e9f23 with SHA-1 2715a08a73
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: Ic494c66247402a0839fa839049196aff29f5d97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:54:38 +00:00
Edmond Chung
a287bef991
Camera: add setsched capability. am: 99b4aebb6a
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076040
Change-Id: I2b276fc1165bcd66d9075566d50f0971e1447811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 20:19:27 +00:00
Automerger Merge Worker
44de2b767b
Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
" into tm-d1-dev-plus-aosp am: 3cb7dddc64
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I03d12de6bfdeb533692ba46089bbdaa1a5ddbb52
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:09:27 +00:00
Wei Wang
9856bda336
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 05f0628196
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I6c02397e8f46d0c495f7d5bd47e477743bde96c0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:00:03 +00:00
Wei Wang
a26e583d7c
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
am: 0335b3f6bc
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I2e638f622cc0abfbd3b894419bcafcf4260791d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:59:40 +00:00
Automerger Merge Worker
3cb7dddc64
Merge "Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
" into tm-d1-dev-plus-aosp
2022-04-26 17:38:53 +00:00
Wei Wang
e652a35fa3
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: bf80f3cc08
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I616b4ca914130186440e4639c441496311fec4ce
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:45 +00:00
Wei Wang
05f0628196
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I52b64f50174a352afb0de2215a10208a13c0f5f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:44 +00:00
Wei Wang
0335b3f6bc
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
am: dff2ecee1c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I414ecceb80c9d85270e4657bf83c6ed9e23b50b7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:41 +00:00
Wei Wang
dff2ecee1c
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I93b6b6da30c68efc6df038a4ba9d30e037abd8bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:57 +00:00
Wei Wang
bf80f3cc08
Merge "Grant trusty to power hal" into tm-dev am: 5e9a38799a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17927853
Change-Id: I79cfb5eb2b9ceca77ce133466e6820a8c81477d4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:24 +00:00
Wei Wang
5e9a38799a
Merge "Grant trusty to power hal" into tm-dev
2022-04-26 16:47:14 +00:00
chiayupei
a53690ac43
hal_sensors_default: Allow sensors HAL to access AoC properties.
...
Bug: 202901227
Test: Verify pass by checking device log.
Signed-off-by: chiayupei <chiayupei@google.com>
Change-Id: I917362ddf4b8e61810d2dd27da2b7775f1aec1e7
2022-04-26 17:50:44 +08:00
Edmond Chung
99b4aebb6a
Camera: add setsched capability.
...
The camera HAL needs to configure schedule policies for
performance optimizations.
Bug: 228632527
Test: adb logcat
Change-Id: Ifbf433c026549ca774a9521704d0b0b75c9e9f23
Merged-In: Ifbf433c026549ca774a9521704d0b0b75c9e9f23
Signed-off-by: Edmond Chung <edmondchung@google.com>
2022-04-25 15:25:01 -07:00
Edmond Chung
ec3eb186b8
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: bc43318ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I0bad94015b6ea1f59f1e64873b2dc346d8607dcc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:32:05 +00:00
Edmond Chung
ac6129be5c
Camera: add setsched capability. am: 2715a08a73
am: c68109ee72
am: 0a19bd4993
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I30039f0947da0e4893addf323b31a8a92616fd7b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:31:14 +00:00
Edmond Chung
42ff0da1b5
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
am: ac4e2bd183
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Iffc8f37963b9a979574b4fb2a178ca507262019f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:30:54 +00:00
Edmond Chung
bc43318ab4
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: Ic43c0ee5f6461b2324b7fbfba4ea3d77f1463387
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:21 +00:00
Edmond Chung
0a19bd4993
Camera: add setsched capability. am: 2715a08a73
am: c68109ee72
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I4778f484ac54693df54e55fcada9405a393811b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:08 +00:00
Edmond Chung
ac4e2bd183
Camera: add setsched capability. am: 2715a08a73
am: 0ddf256588
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I10e45832daefc30d2607c5017e581db4db364c9f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:02:04 +00:00
Edmond Chung
0ddf256588
Camera: add setsched capability. am: 2715a08a73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I226c2636c54592127c8786e1e7a8e58e182159db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:30:22 +00:00
Edmond Chung
c68109ee72
Camera: add setsched capability. am: 2715a08a73
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17928357
Change-Id: I031f55c945c6ec65016255256b70a77f99844b54
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:28:59 +00:00
Edmond Chung
2715a08a73
Camera: add setsched capability.
...
The camera HAL needs to configure schedule policies for
performance optimizations.
Bug: 228632527
Test: GCA, adb logcat
Change-Id: Ifbf433c026549ca774a9521704d0b0b75c9e9f23
2022-04-24 23:08:42 +00:00
Wei Wang
1291c3cec9
Grant trusty to power hal
...
Bug: 229350721
Test: UDFPS with stress
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ia88d6cff1d21940e22ae5122dbfcf52de27ad700
2022-04-24 04:30:03 +00:00
chungkai
e8a9ad3f0e
sepolicy: Remove tracking denials files and fix avc problems am: 11770d9dfe
am: b32938a781
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17874685
Change-Id: Ieb5b0ec3539ac9c1b40221bc1ff8e552e874dc19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:10:22 +00:00
chungkai
b32938a781
sepolicy: Remove tracking denials files and fix avc problems am: 11770d9dfe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17874685
Change-Id: I235258b04149250eddee697483cb33ccdbd915ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 07:47:48 +00:00
chungkai
11770d9dfe
sepolicy: Remove tracking denials files and fix avc problems
...
04-19 10:53:57.364 W binder:575_2: type=1400 audit(0.0:17):
avc: denied { read } for name="wakeup11" dev="sysfs" ino=59892
scontext=u:r:system_suspend:s0 tcontext=u:object_r:sysfs:s0 tclass=dir
permissive=0
Bug: 229670628
Test: pass
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I6a83b77c4a4bb836e4014cf865cb720a360fd981
2022-04-21 07:24:21 +00:00
Alistair Delva
3b278ac414
[automerger skipped] Merge "Remove sysfs_gpu type definition" am: e48b455651
am: f482ea00d9
am: 4f17770b62
-s ours am: 0007374b65
-s ours am: 12d69967ca
-s ours
...
am skip reason: Merged-In I6fcafa87541ed0cbaf3ba74fa5ff4dbdebd533f7 with SHA-1 f2be252260
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/1999630
Change-Id: I5820d675ee839867e0fab611f90aa5a36df317af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:47:15 +00:00
Alistair Delva
12d69967ca
[automerger skipped] Merge "Remove sysfs_gpu type definition" am: e48b455651
am: f482ea00d9
am: 4f17770b62
-s ours am: 0007374b65
-s ours
...
am skip reason: Merged-In I6fcafa87541ed0cbaf3ba74fa5ff4dbdebd533f7 with SHA-1 f2be252260
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/1999630
Change-Id: I61d5c134852af261576dd1fab6b126f5c02130bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:29:03 +00:00
Alistair Delva
0007374b65
[automerger skipped] Merge "Remove sysfs_gpu type definition" am: e48b455651
am: f482ea00d9
am: 4f17770b62
-s ours
...
am skip reason: Merged-In I6fcafa87541ed0cbaf3ba74fa5ff4dbdebd533f7 with SHA-1 f2be252260
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/1999630
Change-Id: I5e6e351d60353e593234ccb3732ee147c2e7d2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 05:13:13 +00:00
Alistair Delva
4f17770b62
Merge "Remove sysfs_gpu type definition" am: e48b455651
am: f482ea00d9
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/1999630
Change-Id: I0edd9718f21b1f31801a793a79dad5d3708b9c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:58:50 +00:00
Alistair Delva
f482ea00d9
Merge "Remove sysfs_gpu type definition" am: e48b455651
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/1999630
Change-Id: I144bf39a8eb4c8fda36cfbceb03e7813faf31f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:43:57 +00:00
Alistair Delva
e48b455651
Merge "Remove sysfs_gpu type definition"
2022-04-21 04:21:45 +00:00
Xin Li
bcc71e1164
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7a573b067c
-s ours am: 104e2d21c2
-s ours am: 7111ceb7e8
-s ours am: a809ae5221
-s ours
...
am skip reason: Merged-In I7f65597f91db5a16d4f9de4f6bb018bd5b50a965 with SHA-1 e60773b926
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17805214
Change-Id: I8e61558b9a3bcc929cf1c10913dacce1affa8652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:30:06 +00:00
Xin Li
a809ae5221
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7a573b067c
-s ours am: 104e2d21c2
-s ours am: 7111ceb7e8
-s ours
...
am skip reason: Merged-In I7f65597f91db5a16d4f9de4f6bb018bd5b50a965 with SHA-1 e60773b926
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17805214
Change-Id: Id4134dfcb8163f03797be1a0f5e66ba92050b046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 08:26:32 +00:00
Xin Li
7111ceb7e8
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 7a573b067c
-s ours am: 104e2d21c2
-s ours
...
am skip reason: Merged-In I7f65597f91db5a16d4f9de4f6bb018bd5b50a965 with SHA-1 e60773b926
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17805214
Change-Id: Icd2489bcc9f6e26fb8e76c0a774ca174e38fada5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:55:38 +00:00
Chung-Kai (Michael) Mei
cf561811f5
Merge "sepolicy: fix avc denials" into tm-dev am: 1875f214c6
am: cdff8c6efa
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17800050
Change-Id: Ie7ab7863e93dcf7fcafe8bcbeb1edc83e7af519c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 03:29:29 +00:00
Chung-Kai (Michael) Mei
cdff8c6efa
Merge "sepolicy: fix avc denials" into tm-dev am: 1875f214c6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17800050
Change-Id: I2636b915fe91b575d6e97764ad17fc5f4da2b473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 03:03:09 +00:00