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

4047 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephane Lee
faec9385c4 Bug fixed in ag/19153533 
Bug: 238143381
Test: N/A
Change-Id: If527ea681abaa221e55533a3dab1371ecac7a3b2
 2022-07-22 16:55:24 -07:00
Minchan Kim
4bd6037084 Merge "Remove vendor_init.te from tracking_denials" 2022-07-21 03:45:37 +00:00
matthuang
bb144cecd2 Add security context for com.google.usf.non_wake_up/wakeup. am: c96220c282 am: c061348b1c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19291365

Change-Id: I71e0c93734dc4c49ab13f24bb18bbf6f02afa8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 02:12:26 +00:00
matthuang
c061348b1c Add security context for com.google.usf.non_wake_up/wakeup. am: c96220c282 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19291365

Change-Id: Idd09818dc82348398e780db3ee81948d75ffda4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 01:47:05 +00:00
matthuang
c96220c282 Add security context for com.google.usf.non_wake_up/wakeup. 
Bug: 195077076
Test: Confirm there is no avc denied log.
Change-Id: I8600283d9ff2ebcb45df95e5259484a60921fb1a
 2022-07-18 15:12:45 +08:00
Jimmy Shiu
55d41f1a3e Remove dontaudit since read early_wakeup completed 
The display file node, early_wakeup, just for trigger the worker for
display and it doesn't have meaningful read function. But PowerHAL read
all nodes and try to dump their valuesi while triggering bugreport. As
the read operation has been completed, so we can remove the clause.

07-02 00:53:56.888   522   522 W android.hardwar: type=1400 audit(0.0:8): avc: denied { dac_read_search } for capability=2 scontext=u:r:hal_power_default:s0 tcontext=u:r:hal_power_default:s0 tclass=capability permissive=0
07-02 00:53:56.888   522   522 W android.hardwar: type=1400 audit(0.0:9): avc: denied { dac_override } for capability=1 scontext=u:r:hal_power_default:s0 tcontext=u:r:hal_power_default:s0 tclass=capability permissive=0

Bug: 221384860
Bug: 192617242
Bug: 171760921
Test: adb shell dumpsys android.hardware.power.IPower/default
Change-Id: If0018499cc19f79819ef69794d7672d5a53de74e
 2022-07-18 11:08:58 +08:00
timmyli
0f73892408 Change SElinux so Aswang can be accessed 
Need to add aswang here so that it can be accessed.

Bug: 234259081
Test: CTS
Change-Id: I3e701df76af8e803017bdfd04ce67093bf21a658
 2022-07-16 06:26:56 +00:00
Tri Vo
78011e9f3a storageproxyd: Remove setuid/setgid SELinux permissions 
Bug: 205904330
Test: boot
Change-Id: Iefecc29752781151679e9f798330a36d14447df9
 2022-07-15 11:07:47 -07:00
SalmaxChang
164b3ee307 [automerger skipped] hal_dumpstate_default: fix avc error am: 2455329536 -s ours am: c0f473a7a8 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: I821c9e823e15c8a25041902aeb48fa4f5ab1fc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 07:57:08 +00:00
SalmaxChang
c0f473a7a8 [automerger skipped] hal_dumpstate_default: fix avc error am: 2455329536 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: I508d88c27a9eee987654acc452d4f45129a8ed18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 07:38:25 +00:00
Minchan Kim
86ef69850b Remove vendor_init.te from tracking_denials 
Since last error fixed, remove the vendor_init.te from tracking_denials.

Bug: 190337297
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I5178c864a70748c1dddf8c08baa8d653cd0225d9
 2022-07-15 05:10:55 +00:00
Adam Shih
32d987cd24 Update SELinux error 
Bug: 234547283
Change-Id: I50bd66a22755eefe7aa24ec1042e3b6cb627ad3d
 2022-07-15 00:30:47 +00:00
Adam Shih
74d2d8963f Update error on ROM 8820442 
Bug: 238825802
Test: testSysfsHealth
Change-Id: I607f78de19b18b258309f89669ded393dd74a2a7
 2022-07-13 11:01:28 +08:00
Adam Shih
c6186c2960 Update SELinux error 
Test: checkSensors
Bug: 238571420
Test: checkLockScreen
Bug: 238570971
Test: scanBugreport
Bug: 238571324
Change-Id: Ia6f2db6374d7ebe1a9c3f5b0bd8d152ed9d4a9a0
 2022-07-11 10:24:12 +08:00
SalmaxChang
2455329536 hal_dumpstate_default: fix avc error 
avc: denied { search } for comm="dumpstate@1.1-s" name="modem_stat" dev="dm-44" ino=341 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:modem_stat_data_file:s0 tclass=dir

Bug: 235963885
Change-Id: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
Merged-In: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
 2022-07-08 03:24:01 +00:00
Adam Shih
347e482d19 Update SELinux error 
Test: checkLockScreen
Bug: 238263438
Bug: 238263568
Change-Id: I694924ceb031abb749e4b92a715d3b7dc87088be
 2022-07-07 11:29:44 +08:00
Adam Shih
bc85d46045 ignore shell access on wlc 
Bug: 238038592
Test: boot
Change-Id: I09b67ca07d7f9573d77f64686fb818d4dc1753cc
 2022-07-06 14:44:41 +08:00
Adam Shih
a8aeb4a6c9 Update SELinux error 
Test: SELinuxUncheckedDenialBootTest
Bug: 238143262
Bug: 238143381
Change-Id: Ibe3ce917418d71b61aa6d085041a51dda5998c74
 2022-07-06 02:58:51 +00:00
Adam Shih
7835523aea Update SELinux error 
Test: SELinuxUncheckedDenialBootTest
Bug: 238038592
Change-Id: Id248ba82c49fa09be28f7a0219eb42b0ecc9e358
 2022-07-05 11:17:25 +08:00
TreeHugger Robot
ae60f4bc6d Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." into tm-qpr-dev am: 59d6e09682 am: df9d1731af 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18871451

Change-Id: I354e568b012ef36d65a843185c2e4d1b7509c522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 03:12:56 +00:00
TreeHugger Robot
df9d1731af Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." into tm-qpr-dev am: 59d6e09682 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18871451

Change-Id: I931993bfd0b94da00fed9e4ff6c25f95fdb9509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 02:45:20 +00:00
TreeHugger Robot
59d6e09682 Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." into tm-qpr-dev 2022-07-01 02:15:21 +00:00
Xin Li
67cdc2bdb0 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours am: 25bb42eb54 -s ours am: 37f3d28139 -s ours am: bce330f037 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: Ie532ae3f4c110dae29846d296d77fd394738ba9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 01:04:43 +00:00
Xin Li
bce330f037 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours am: 25bb42eb54 -s ours am: 37f3d28139 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: I22d734bfc6aa1ca4f63f10f63ad386433fa6173a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:09 +00:00
Xin Li
37f3d28139 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours am: 25bb42eb54 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: Ia4c9ae47f3f455d5b629f301937ade0f9f07359a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:26 +00:00
Xin Li
25bb42eb54 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

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

Change-Id: I39a8ce7402950e78469ba04412f430381f0d9f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:12:56 +00:00
Xin Li
351260db12 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
Change-Id: I0f66cef4179df45ee56af588df1fe1b82b0f642a
 2022-06-27 23:37:34 +00:00
sashwinbalaji
7600ddd96b thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a am: 7bb947b88e am: cbbe4561a3 am: fcf9cbcb83 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I7468f221840e910a05136009d0639b5f96eef636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 10:11:47 +00:00
sashwinbalaji
fcf9cbcb83 thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a am: 7bb947b88e am: cbbe4561a3 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I97cdd61e0634bce617d72d4543d856c709b3bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:54:20 +00:00
sashwinbalaji
cbbe4561a3 thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a am: 7bb947b88e 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I4e27c835adfe73ef473b2afd2b303a36307e6ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:32:01 +00:00
sashwinbalaji
7bb947b88e thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I71bd9b49f2dc76e1e50f0b35bd404f7c8660d5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:07:19 +00:00
sashwinbalaji
6ffe88201a thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: Ifc9b8e1d980dee52194a08805052f28bb2b7df8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 08:49:10 +00:00
sashwinbalaji
1a4cd82bc8 thermal: added property persist.vendor.disable.thermal.dfs.control 
Updated the sepolicy to access tmu register

Bug: 235156080
Test: Used local build to verify security context of tmu_reg files
Change-Id: Ia2a274ec3424bfeec25ae24e762f8ad41cb7ae86
 2022-06-24 13:54:24 +08:00
SalmaxChang
f9a757b52a [automerger skipped] modem_svc: Fix avc error am: a9157994c3 -s ours am: 7f2be55a04 -s ours 
am skip reason: Merged-In I51db41d73be317cc7fc84981ac5f04e254a360d0 with SHA-1 1be95c2e33 is already in history

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

Change-Id: I20f62fed2cb71eb9e205a0635a9607cb623dc501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 10:03:01 +00:00
SalmaxChang
7f2be55a04 [automerger skipped] modem_svc: Fix avc error am: a9157994c3 -s ours 
am skip reason: Merged-In I51db41d73be317cc7fc84981ac5f04e254a360d0 with SHA-1 1be95c2e33 is already in history

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

Change-Id: I1bc24cab890b9f10a620723013f44b782efaa8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 09:44:04 +00:00
SalmaxChang
a9157994c3 modem_svc: Fix avc error 
avc: denied { write } for comm="modem_svc_sit" name="modem_stat" dev="dm-42" ino=331 scontext=u:r:modem_svc_sit:s0 tcontext=u:object_r:vendor_data_file:s0 tclass=dir permissive=0

Bug: 234844823
Change-Id: I51db41d73be317cc7fc84981ac5f04e254a360d0
Merged-In: I51db41d73be317cc7fc84981ac5f04e254a360d0
 2022-06-22 04:21:37 +00:00
SalmaxChang
0cef5e66fe hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d am: ba3c6036fc am: 8bbd5d3430 am: d3dba796f9 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: Ia6b24e15d0118326f253d0327d4a8e0cf874d879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:26:10 +00:00
SalmaxChang
d3dba796f9 hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d am: ba3c6036fc am: 8bbd5d3430 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: Iecec85303b3b51cbd69f1ea8ca28448f0b0d80d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:07:39 +00:00
SalmaxChang
8bbd5d3430 hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d am: ba3c6036fc 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: I1fafe1f2fe007191a32368f82b06985038ea029c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:41:35 +00:00
SalmaxChang
ba3c6036fc hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: I9167e7032d77a57f41f2592378b551b60f09a375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:24:59 +00:00
SalmaxChang
12053bbe8d hal_dumpstate_default: fix avc error am: de88097de5 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: Iaabe145decca9d0129a8f74a92782e5fe7ddcbcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:05:20 +00:00
SalmaxChang
de88097de5 hal_dumpstate_default: fix avc error 
avc: denied { search } for comm="dumpstate@1.1-s" name="modem_stat" dev="dm-44" ino=341 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:modem_stat_data_file:s0 tclass=dir

Bug: 235963885
Change-Id: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
 2022-06-20 15:55:16 +08:00
Xin Li
3a654c2091 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours am: 00e8d1827d -s ours am: 432d5becd9 -s ours am: 7370b90d0c -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: Ifca8d503ff11a46856483b85836c9c5bab17620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:34:25 +00:00
Xin Li
6ec6e60aa9 [automerger skipped] Merge Android 12 QPR 3 am: 83d71652ff -s ours am: 5354139d04 -s ours am: 13407053a9 -s ours am: 71aa410b60 -s ours am: 418fc579cf -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: Iad72a9210e2fdb5ad6c036f38ca7c778e1c73238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:33:24 +00:00
Xin Li
7370b90d0c [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours am: 00e8d1827d -s ours am: 432d5becd9 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: I2e61493424d6005b84e508a164dbdfc8cb620959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:53:34 +00:00
Xin Li
418fc579cf [automerger skipped] Merge Android 12 QPR 3 am: 83d71652ff -s ours am: 5354139d04 -s ours am: 13407053a9 -s ours am: 71aa410b60 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: I3aa710139ea78361344a91540ff74a129ad9cd42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:32 +00:00
Xin Li
432d5becd9 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours am: 00e8d1827d -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: I59891a9fc89b4b576b05593188ee8c5c19149b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:57:16 +00:00
Xin Li
71aa410b60 [automerger skipped] Merge Android 12 QPR 3 am: 83d71652ff -s ours am: 5354139d04 -s ours am: 13407053a9 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: I61c42e670fc5fcfdf085981b4b63c91b7a5bd7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:14 +00:00
Xin Li
00e8d1827d [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: Id71e7f97e4ac0c7151e4532605e7b35f5f673de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:10 +00:00
Xin Li
13407053a9 [automerger skipped] Merge Android 12 QPR 3 am: 83d71652ff -s ours am: 5354139d04 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

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

Change-Id: Ib611f0ae04b30e7a0fab7d851d6d31b365069580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:09 +00:00