Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2953 commits 1 branch 0 tags 494 MiB
Commit graph

2953 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Hsu
5675757d41 [SELinux] Allow NNAPI HAL to log traces to perfetto under userdebug builds 
Allows DarwiNN NNAPI HAL to log traces to perfetto only under userdebug builds. This is similar to the camera HAL fix in ag/17080874

Error message:
TracingMuxer: type=1400 audit(0.0:486): avc: denied { write } for name="traced_producer" dev="tmpfs" ino=1116 scontext=u:r:hal_neuralnetworks_darwinn:s0

This rule is common for EdgeTPU in both WHI and PRO.

Bug: 231838536

Test: tested on PRO before and after the change, and the traces now shows up.

Example: https://ui.perfetto.dev/#!/?s=ab911b3972bc16a1a831e148a7446c09757a08426bbe3c3b16d31a728b1d923
https://screenshot.googleplex.com/3roWETkTFyiDjW9

Change-Id: I8d4a57e262087aa4ec6670a487d7b06d2f2cde69
 2022-05-07 22:28:22 -07:00
Will McVicker
9cbc9eceec genfs_contexts: fix more i2c raw paths 
These were added in commit 8a19d8be9c ("genfs_contexts: fix path for
i2c peripheral devices") to address missing i2c paths when kernel
modules are loaded in parallel. The raw i2c paths were not added in that
commit. So add them here in order to fix a vibrator crash for
P21-mainline due to not having the named i2c paths.

Bug: 231637004
Fixes: 8a19d8be9c ("genfs_contexts: fix path for i2c peripheral devices")
Change-Id: I02dfff504704f761c99c328b39595789c2cbeef5
 2022-05-05 16:04:31 -07:00
Automerger Merge Worker
3104c4a127 Merge changes from topic "am-0bfd604f0d864cebafcc014a9d92c68f" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "gs101-move-dwc3-irq" into tm-dev am: 36f7fe941d am: 82a83b366a -s ours
  [automerger skipped] Allow hal_usb_gadget_impl to access proc_irq am: 7ac349e932 am: b5c3f6e0ba -s ours
 2022-05-05 08:45:19 +00:00
TreeHugger Robot
51ec6b2556 [automerger skipped] Merge changes from topic "gs101-move-dwc3-irq" into tm-dev am: 36f7fe941d am: 82a83b366a -s ours 
am skip reason: Merged-In Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af with SHA-1 bf9ec40ab7 is already in history

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

Change-Id: I464fe247cecdf3cd991c7c4411e083e918db6bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 08:45:08 +00:00
Ray Chi
aabbf7b0b8 [automerger skipped] Allow hal_usb_gadget_impl to access proc_irq am: 7ac349e932 am: b5c3f6e0ba -s ours 
am skip reason: Merged-In Id9a9adbdc921629b6e89d0850dd8acaf76b1a891 with SHA-1 d99789413d is already in history

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

Change-Id: I694886b2a15b6166efa0a33bf689e88284dfa3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 08:45:06 +00:00
TreeHugger Robot
d4e4b4a6af [automerger skipped] Merge changes from topic "gs101-move-dwc3-irq" into tm-dev am: 36f7fe941d -s ours am: b0150a74b2 -s ours 
am skip reason: Merged-In Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af with SHA-1 bf9ec40ab7 is already in history

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

Change-Id: I32edfb0f85dfd925ff19dfa92fdbc19d31ee46bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 08:44:59 +00:00
Ray Chi
65c0676c78 [automerger skipped] Revert "add sepolicy for set_usb_irq.sh" am: 503fa09010 -s ours am: 7142c373d0 -s ours 
am skip reason: Merged-In Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af with SHA-1 bf9ec40ab7 is already in history

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

Change-Id: I9b4caee9956da389a2a536368b29a8c2ef56b7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 08:44:56 +00:00
TreeHugger Robot
82a83b366a Merge changes from topic "gs101-move-dwc3-irq" into tm-dev am: 36f7fe941d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18164764

Change-Id: Ie610b6f31e218dece80fb0dc52b66050382d4e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 07:27:14 +00:00
Ray Chi
b5c3f6e0ba Allow hal_usb_gadget_impl to access proc_irq am: 7ac349e932 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17313628

Change-Id: I12709e8375ab34a1ed08ae48ce2db522d98f188c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 07:27:12 +00:00
TreeHugger Robot
b0150a74b2 [automerger skipped] Merge changes from topic "gs101-move-dwc3-irq" into tm-dev am: 36f7fe941d -s ours 
am skip reason: Merged-In Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af with SHA-1 bf9ec40ab7 is already in history

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

Change-Id: I266ef74a19dcabf4b082bc615171c83e1d6f734f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 07:24:34 +00:00
Ray Chi
7142c373d0 [automerger skipped] Revert "add sepolicy for set_usb_irq.sh" am: 503fa09010 -s ours 
am skip reason: Merged-In Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af with SHA-1 bf9ec40ab7 is already in history

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

Change-Id: I5a6fc1b839a695d9171418b35327c4525d5900a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 07:24:32 +00:00
TreeHugger Robot
36f7fe941d Merge changes from topic "gs101-move-dwc3-irq" into tm-dev 
* changes:
  Revert "add sepolicy for set_usb_irq.sh"
  Allow hal_usb_gadget_impl to access proc_irq
 2022-05-05 07:08:20 +00:00
Automerger Merge Worker
e2f63c02f4 Merge "Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev am: 650209645c am: b83ddf305d" into tm-d1-dev-plus-aosp 2022-05-05 02:44:35 +00:00
Yichi Chen
0f55e1902c Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev am: 650209645c am: b83ddf305d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17823364

Change-Id: If4cfae538262a249652c51cf2b911c8f1bfcf91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:44:20 +00:00
Yichi Chen
e2a93ee001 Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev am: 650209645c am: b2c0884cd9 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17823364

Change-Id: I5ff9750abee568345789c6a2f9ad9d6df3eff8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:44:18 +00:00
Yichi Chen
b2c0884cd9 Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev am: 650209645c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17823364

Change-Id: I3053433540b747906ef69eed537d9eb600923a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:25 +00:00
Yichi Chen
b83ddf305d Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev am: 650209645c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17823364

Change-Id: I7fcfd0a6cfc006f2f68a5aa1d1e97f88ca321f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:17:59 +00:00
Yichi Chen
650209645c Merge "Allow hal_fingerprint_default to access hal_pixel_display_service" into tm-dev 2022-05-05 02:03:49 +00:00
William McVicker
408b5b3896 Merge "genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes" into tm-dev am: e6250cd86e am: cb0bdc8681 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18123741

Change-Id: If57f9e8b5b75fca8a5b1bd2c30c6b347762aad71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:11:45 +00:00
William McVicker
cd65dd36d5 Merge "genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes" into tm-dev am: e6250cd86e am: 18cb713b62 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18123741

Change-Id: Idef6f9e9c77289b596a2346817e37e3f555d4361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:10:26 +00:00
William McVicker
18cb713b62 Merge "genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes" into tm-dev am: e6250cd86e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18123741

Change-Id: I8abb96731bc5d3b3f95168607dcfe8932d3f3727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:39:32 +00:00
William McVicker
cb0bdc8681 Merge "genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes" into tm-dev am: e6250cd86e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18123741

Change-Id: I11fe5e32944b784ad60c3b88177cddff72db879b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:38:59 +00:00
William McVicker
e6250cd86e Merge "genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes" into tm-dev 2022-05-04 16:10:16 +00:00
Ray Chi
503fa09010 Revert "add sepolicy for set_usb_irq.sh" 
This reverts commit 714075eba7.

Bug: 224699556
Test: build pass
Change-Id: Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af
Merged-In: Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af
(cherry picked from commit bf9ec40ab7)
 2022-05-04 11:45:26 +00:00
Ray Chi
7ac349e932 Allow hal_usb_gadget_impl to access proc_irq 
Bug: 224699556
Test: build pass
Change-Id: Id9a9adbdc921629b6e89d0850dd8acaf76b1a891
Merged-In: Id9a9adbdc921629b6e89d0850dd8acaf76b1a891
(cherry picked from commit 455c3c165348fa9ea65c65b004d4dda1426d04be)
 2022-05-04 11:45:08 +00:00
Ray Chi
e028181261 Revert "add sepolicy for set_usb_irq.sh" am: bf9ec40ab7 am: 9a2c989fb7 am: 0c04f75e49 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086225

Change-Id: Ie73eba5478ebe798a92dd9ef1ec5d9ffb1ff8b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 08:58:51 +00:00
Ray Chi
d3a233b1f0 Allow hal_usb_gadget_impl to access proc_irq am: d99789413d am: 98225a40ac am: 7fa97ff2ba 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086224

Change-Id: If1f7a07f1b2f0497fc6bf092ccdb30cac2ce36d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 08:58:50 +00:00
Ray Chi
0c04f75e49 Revert "add sepolicy for set_usb_irq.sh" am: bf9ec40ab7 am: 9a2c989fb7 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086225

Change-Id: I3002e1842255353047726918a2f41553c1a43b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 07:28:51 +00:00
Ray Chi
7fa97ff2ba Allow hal_usb_gadget_impl to access proc_irq am: d99789413d am: 98225a40ac 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086224

Change-Id: I5555829b6b3b0d0234449933f44b4da2aadd5340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 07:28:48 +00:00
Ray Chi
9a2c989fb7 Revert "add sepolicy for set_usb_irq.sh" am: bf9ec40ab7 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086225

Change-Id: Id9ebe6c1a58dbd45fe2dc381cf79f8be2fbb2287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 06:52:05 +00:00
Ray Chi
98225a40ac Allow hal_usb_gadget_impl to access proc_irq am: d99789413d 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2086224

Change-Id: Iac35a7fc9508e991f03bd9142a552f3e4e43981c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 06:52:04 +00:00
Ray Chi
bf9ec40ab7 Revert "add sepolicy for set_usb_irq.sh" 
This reverts commit 714075eba7.

Bug: 194346886
Test: build pass
Change-Id: Ie275e48ee87c4e9f5c83b7802c3f3baa12ad30af
 2022-05-04 09:49:17 +08:00
Ray Chi
d99789413d Allow hal_usb_gadget_impl to access proc_irq 
Bug: 220996010
Test: build pass
Change-Id: Id9a9adbdc921629b6e89d0850dd8acaf76b1a891
(cherry picked from commit 455c3c165348fa9ea65c65b004d4dda1426d04be)
 2022-05-04 09:46:39 +08:00
Jenny Ho
64c0cad5f9 Merge "sepolicy: allow access debugfs charger register dump" into tm-dev am: 9b27bbdab6 am: d1b13f7695 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17944214

Change-Id: I08b3c694edc80db2b86cd69f244da319b0888e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:06:10 +00:00
Jenny Ho
1941a0eed3 Merge "sepolicy: allow access debugfs charger register dump" into tm-dev am: 9b27bbdab6 am: 549a58875a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17944214

Change-Id: Ic9ba8f2d7e6a3df630c2eef9d5624736a5a06961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:57:52 +00:00
Jenny Ho
d1b13f7695 Merge "sepolicy: allow access debugfs charger register dump" into tm-dev am: 9b27bbdab6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17944214

Change-Id: I58800e42bead3292e710f361e43829b221c4ee67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:31:51 +00:00
Jenny Ho
549a58875a Merge "sepolicy: allow access debugfs charger register dump" into tm-dev am: 9b27bbdab6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17944214

Change-Id: Ic470338a2d29551f83a06795ddb75ba43838a380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:30:43 +00:00
Jenny Ho
9b27bbdab6 Merge "sepolicy: allow access debugfs charger register dump" into tm-dev 2022-05-03 10:39:21 +00:00
Albert Wang
2b58dec0f9 Merge "Expand the xHCI wakeup path for suspend_control" am: 77db706d9b am: 84866a80c1 am: 11aeebbc15 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2075870

Change-Id: I937c883d1e2198d05a95b8437dc8230f6a2125c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:18:50 +00:00
Albert Wang
11aeebbc15 Merge "Expand the xHCI wakeup path for suspend_control" am: 77db706d9b am: 84866a80c1 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2075870

Change-Id: I7eb9ed2f555c49806685deede90d169b8f5bf71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:46:25 +00:00
Albert Wang
84866a80c1 Merge "Expand the xHCI wakeup path for suspend_control" am: 77db706d9b 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2075870

Change-Id: I53ad439a4804bd84c02adce154d182ba2fa79554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:40:48 +00:00
Albert Wang
77db706d9b Merge "Expand the xHCI wakeup path for suspend_control" 2022-05-03 07:14:40 +00:00
Asad Ali
4345829694 Allow chre to communicate with fwk_stats_service. am: c6ea8d1656 am: bc040f306d am: 98e8bf3e45 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2077138

Change-Id: I98eccdac6fd86f74bf850c1d2263cb51a5e33b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:51 +00:00
Asad Ali
98e8bf3e45 Allow chre to communicate with fwk_stats_service. am: c6ea8d1656 am: bc040f306d 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2077138

Change-Id: Ieb41d6bd22ee5500269261652993f0866ac795bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:06:22 +00:00
Asad Ali
bc040f306d Allow chre to communicate with fwk_stats_service. am: c6ea8d1656 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2077138

Change-Id: I54420bcfe55250683a2afd25a85242cdf5056e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 21:33:11 +00:00
Will McVicker
12b3700a38 genfs_contexts: add raw i2c-s2mpg10mfd and i2c-s2mpg11mfd nodes 
This adds the [067]-001f and [178]-002f raw i2c numberings to the
sepolicy for the P21-mainline driver which doesn't use the i2c vendor
hook to rename these numberings. This is required for the thermal hal to
work.

Bug: 231155356
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I8e4bbbd0768e63e708f46eb42bddb5fc28b29caa
 2022-05-02 10:12:15 -07:00
Treehugger Robot
0352020df2 Merge "hal_sensors_default: Allow sensors HAL to access AoC properties." am: f939ebb650 am: e07bb61a68 am: f1840dcecf 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076498

Change-Id: Ifc4aadd80951511a226165a4008cf13d61f3e886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:04:14 +00:00
Asad Ali
f7c12d9b9c [automerger skipped] Merge "Update SELinux to allow CHRE to talk to the Wifi HAL" am: a022023a90 am: a9528564c0 -s ours am: 222d59bff3 -s ours 
am skip reason: Merged-In I73bcf96ed1cab0a101e5f84852a1d82258b9c690 with SHA-1 613bdcdec8 is already in history

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

Change-Id: Idd9184e4b1f1eaef7e45b86e3409f159e027e6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:52:22 +00:00
Treehugger Robot
d0b2e4d807 [automerger skipped] Merge "android.hardware.usb.IUsb AIDL migration" am: c49520d66e am: fd65b31055 -s ours am: 766c16cc25 -s ours 
am skip reason: Merged-In Ia8c24610244856490c8271433710afb57d3da157 with SHA-1 51735ba3ab is already in history

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

Change-Id: I0cd1b8b0935f2bb1887f48e3758a72546ce15a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:50:01 +00:00
Treehugger Robot
f1840dcecf Merge "hal_sensors_default: Allow sensors HAL to access AoC properties." am: f939ebb650 am: e07bb61a68 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2076498

Change-Id: I7987d60f9164e4864f1271bc2af89ef86b8be5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:11:18 +00:00