Badhri Jagan Sridharan
f6cc2cde2c
Merge "Allow usb hal to read contaminantdisable property" into tm-dev am: 93b8189c2b
am: ddfbcf6a0a
am: 4956581a1a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Change-Id: I0d948a18b56db93d1fa9cb757a758fb832c03090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 23:19:40 +00:00
Badhri Jagan Sridharan
4956581a1a
Merge "Allow usb hal to read contaminantdisable property" into tm-dev am: 93b8189c2b
am: ddfbcf6a0a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Change-Id: I1309cd550885743314cadf6073a1d8cdee3e764d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 23:06:04 +00:00
Badhri Jagan Sridharan
04d66dd766
Merge "Allow usb hal to read contaminantdisable property" into tm-dev am: 93b8189c2b
am: 798cd60026
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Change-Id: Ieec42757151cd070dbb707a84efe0e3d97af1ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 22:59:36 +00:00
Badhri Jagan Sridharan
ddfbcf6a0a
Merge "Allow usb hal to read contaminantdisable property" into tm-dev am: 93b8189c2b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Change-Id: I8bb37378e46fe74cbd6251f6918b86e84ee63bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 22:45:21 +00:00
Badhri Jagan Sridharan
798cd60026
Merge "Allow usb hal to read contaminantdisable property" into tm-dev am: 93b8189c2b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Change-Id: I334c2578b4f6ad9488c670f5ea0c4a470cb30cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 22:44:22 +00:00
Badhri Jagan Sridharan
93b8189c2b
Merge "Allow usb hal to read contaminantdisable property" into tm-dev
2022-04-11 22:22:28 +00:00
Badhri Jagan Sridharan
297686492f
[automerge] Allow usb hal to read contaminantdisable property 2p: 8606aa8a51
2p: a2f5fc80f4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Bug: 227792357
Change-Id: Ia7a478cc75350677695c3d76e2b86ac0a59c16ad
2022-04-08 00:26:11 +00:00
Badhri Jagan Sridharan
a2f5fc80f4
[automerge] Allow usb hal to read contaminantdisable property 2p: 8606aa8a51
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17649293
Bug: 227792357
Change-Id: I0c6937f89bfadf38eb55dbb42a5d55ba8419750d
2022-04-08 00:26:04 +00:00
Badhri Jagan Sridharan
8606aa8a51
Allow usb hal to read contaminantdisable property
...
avc: denied { read } for comm="android.hardwar" name="u:object_r:vendor_usb_config_prop:s0"
dev="tmpfs" ino=367 scontext=u:r:hal_usb_impl:s0
tcontext=u:object_r:vendor_usb_config_prop:s0 tclass=file permissive=0
Bug: 227792357
Change-Id: Id4d5ef7c214f0c0f672db28991b9fbe0152530b7
2022-04-07 17:21:15 -07:00
Chung-Kai (Michael) Mei
19701a1770
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev am: 9a909d4058
am: 363728f850
am: 9abc3f0821
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17614589
Change-Id: Ie6ad6099d68b1bd8733d78980a80ad7b7951e169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:26 +00:00
chungkai
4d15f903df
genfs_contexts: fix path for i2c peripheral devices am: 8a19d8be9c
am: cd1005d92a
am: d3ca95e58b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17504913
Change-Id: I5eaa1f251e7f04683f85d50dccebca35133dc918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:13:19 +00:00
Chung-Kai (Michael) Mei
9abc3f0821
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev am: 9a909d4058
am: 363728f850
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17614589
Change-Id: Ie1cfd60100d792f4abe07b2bc3503bf7d9a4ca29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:52:26 +00:00
chungkai
d3ca95e58b
genfs_contexts: fix path for i2c peripheral devices am: 8a19d8be9c
am: cd1005d92a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17504913
Change-Id: Ib25f5de1880cc145fecb974d82fb61a9a6448d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:52:21 +00:00
Chung-Kai (Michael) Mei
67da7dc548
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev am: 9a909d4058
am: 64e14e7379
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17614589
Change-Id: Ic7fb450621881a6540374ae11fad040311746a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:51:48 +00:00
Chung-Kai (Michael) Mei
363728f850
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev am: 9a909d4058
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17614589
Change-Id: I072c7a8e680a7998574f9a20863b2c4ab269f076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:31:05 +00:00
chungkai
cd1005d92a
genfs_contexts: fix path for i2c peripheral devices am: 8a19d8be9c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17504913
Change-Id: Ie14aabd4432cf66615265a8e29f115fef417e590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:30:59 +00:00
Chung-Kai (Michael) Mei
64e14e7379
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev am: 9a909d4058
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17614589
Change-Id: I815bb946971fca3762647a3de3e00690557ecb95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 10:30:36 +00:00
Chung-Kai (Michael) Mei
9a909d4058
Merge changes from topic "gs101_parallel_load_sepolicy" into tm-dev
...
* changes:
sepolicy: ignore avc denial
genfs_contexts: fix path for i2c peripheral devices
2022-04-07 09:33:26 +00:00
Siddharth Kapoor
a578811cad
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 9d3a25fb29
am: 5d40de63da
am: ae2cd552b6
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: I563529bc514c0d1b6b21e792a12053656b7c2acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 05:16:45 +00:00
Siddharth Kapoor
e0f9e9d0fa
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 9d3a25fb29
am: c4db9c9fee
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: Ibf6518f1f95ff3ee1bc44ad202577697326f94cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 04:54:24 +00:00
Siddharth Kapoor
ae2cd552b6
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 9d3a25fb29
am: 5d40de63da
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: I699a703f900368346348598c25e95a76595d8d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 04:45:57 +00:00
Siddharth Kapoor
5d40de63da
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 9d3a25fb29
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: I91ec76384d8ba27c6ef35ff7871fde1d1172659f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 04:23:37 +00:00
Siddharth Kapoor
c4db9c9fee
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev am: 9d3a25fb29
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: I74da1b4b3bcb1f7c7625c01a61590e8ea24da47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 04:22:33 +00:00
Siddharth Kapoor
9d3a25fb29
Merge "Revert "Move ODPM file rule to pixel sepolicy"" into tm-dev
2022-04-07 04:06:31 +00:00
Siddharth Kapoor
df172dc5d9
[automerge] Revert "Move ODPM file rule to pixel sepolicy" 2p: 13f85a37f3
2p: 86e649b033
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: Ieeb51dcfba6ad5796405177a77893ed14897b061
2022-04-07 03:30:43 +00:00
Siddharth Kapoor
86e649b033
[automerge] Revert "Move ODPM file rule to pixel sepolicy" 2p: 13f85a37f3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17609198
Change-Id: I1c17b6ecf4850e214e5c3beb88d26c70a368368c
2022-04-07 03:30:21 +00:00
Siddharth Kapoor
13f85a37f3
Revert "Move ODPM file rule to pixel sepolicy"
...
Revert "Move ODPM file rule to pixel sepolicy"
Revert submission 17215583-odpm_sepolicy_refactor-tm-dev
Reason for revert: build failure tracked in b/228261711
Reverted Changes:
Ic9a89950a:Move ODPM file rule to pixel sepolicy
I24105669b:Move ODPM file rule to pixel sepolicy
I044a285ff:Move ODPM file rule to pixel sepolicy
Change-Id: I36abfddaa5903739f9c5bf65d3c1cd506db9e604
2022-04-07 03:29:56 +00:00
Albert Wang
8a877f5cd8
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
am: 7839be7474
am: 8713e0b0b7
am: b272ee65c7
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: I5aebc989c3c77cadf24400d00c3d0c8c3f0c58e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 10:01:29 +00:00
Albert Wang
b272ee65c7
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
am: 7839be7474
am: 8713e0b0b7
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: Ida21469b1d9ece7233bb44f3738c1eb20a0b09c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 09:25:14 +00:00
Albert Wang
978413716b
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
am: 7839be7474
am: cd8219c7be
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: If0c3564cc3c6a83258ed82b36e1576b24e115bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 09:24:46 +00:00
chungkai
384218408f
sepolicy: ignore avc denial
...
dont audit since it's debugfs
Bug: 228181404
Test: forrest with boot test
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I7f2a85e2a405c78c9d8d11e9c2fdfdc5e87f7931
2022-04-06 09:21:24 +00:00
chungkai
8a19d8be9c
genfs_contexts: fix path for i2c peripheral devices
...
paths are changed when we enable parallel module loading and
reorder the initializtaion of devices.
Test: without avc denial on Raven
Bug: 227541760
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I7d835205696fd727e9be24fcf010ed44bcd5d6ae
2022-04-06 09:15:46 +00:00
Albert Wang
8713e0b0b7
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
am: 7839be7474
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: I02382970a84b9b2f8a5f0002d1ee6d225fd09b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 09:04:42 +00:00
Albert Wang
cd8219c7be
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
am: 7839be7474
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: I1cfb6ac90a4eb6b3d9d6f046b30622936c27244e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 09:03:45 +00:00
Albert Wang
7839be7474
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
am: aed8848fb0
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: I251a791b13d863de275ceffc3ba926db9a458c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 08:42:39 +00:00
Albert Wang
aed8848fb0
Add more xHCI wakeup path for suspend_control am: e60773b926
am: 092298b579
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: Ieaa74f326039e13ec8409167112c11b16cb47480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 08:15:54 +00:00
Albert Wang
092298b579
Add more xHCI wakeup path for suspend_control am: e60773b926
...
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2052478
Change-Id: Ib07b92bf159c8b69dcdc7bc17e7f19a44aab20f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 08:00:41 +00:00
Sam Ou
347296cd87
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev am: de81154964
am: 0f7d68a9b1
am: 5529a1f44b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17215583
Change-Id: I501960e1cb148445858e010c9484e48103feede8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:26:16 +00:00
Sam Ou
5529a1f44b
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev am: de81154964
am: 0f7d68a9b1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17215583
Change-Id: I2c343dd3160802f3b415785305df8922a03f69d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:59:43 +00:00
Sam Ou
27167ced5c
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev am: de81154964
am: 24ef7db4f3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17215583
Change-Id: I86ec424153a5443a4cf3576a946c793b8aa0b5d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:59:24 +00:00
Sam Ou
0f7d68a9b1
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev am: de81154964
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17215583
Change-Id: I5043f68a22d8887a0105613bf848edf7655b776c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:38:48 +00:00
Sam Ou
24ef7db4f3
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev am: de81154964
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17215583
Change-Id: I277d684d530ac6e4e96138c80bdc2021a7067220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:37:54 +00:00
Sam Ou
de81154964
Merge "Move ODPM file rule to pixel sepolicy" into tm-dev
2022-04-06 02:09:38 +00:00
Xin Li
8f94db0a76
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours am: 6c7329e78a
-s ours am: f43a918617
-s ours am: 2ee23c3894
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: I79516700fcb1f7a88f1a3f7208157e99f8e41acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:39:02 +00:00
Xin Li
2ee23c3894
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours am: 6c7329e78a
-s ours am: f43a918617
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: I6c38baa51c6733424393b0e1d0a17722d2330bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:08:53 +00:00
Xin Li
e98156e279
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours am: 6c7329e78a
-s ours am: ed68f78914
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: Ic093de2196ed07ccc529f276b398ed1b3ff6f91c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:00:39 +00:00
Xin Li
f43a918617
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours am: 6c7329e78a
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: I2b05cb9279ab108de85891cbe7136c228ac04203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:31:00 +00:00
Xin Li
ed68f78914
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours am: 6c7329e78a
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: Ibfff57b71a0653f295b56b6f55e8b46d6029cddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:29:44 +00:00
Xin Li
6c7329e78a
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours am: 4295b8c5bb
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: Iccd31c0bb403d722d24d093730327b024e4342ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:50 +00:00
Xin Li
4295b8c5bb
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 815b133c28
-s ours
...
am skip reason: Merged-In I1ae4b99a9fa4fc95f96ee1f36dc500f453653ca7 with SHA-1 24b4d1b601
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/17543362
Change-Id: I3183293f6ba3e1858233ce35170f935f3b03c1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:50 +00:00