PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,188 Commits 1 Branch 0 Tags
171e66e0009a192d1d20e9870985d1a7925e016b
Commit Graph

112188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bc45b9f125 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If406f25ee072b3c2a778d2e007abecc99f06caf6
 2023-03-28 17:58:08 -07:00
Bill Yi
113326ed83 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I278cdc816710d5eb2cf8fa3997d55aee0e3efa73
 2023-03-28 17:54:17 -07:00
Julia Reynolds
1519918e3c [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: Iec236411e347c5f11ae46a3fe339f402a34f0355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:12:41 +00:00
Julia Reynolds
812747f662 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I16d62672bad5e2fe6f7a392355f05d32eb7df2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:35:17 +00:00
Julia Reynolds
f1bd633fec [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I3f18d0dfa27c9b8efd19e9f551605f7ff345c145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:01:10 +00:00
Julia Reynolds
40bec70af8 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:43:18 +00:00
Julia Reynolds
bb787882ef [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Change-Id: Ic3ea8057dd4ec225ef8464c579919a8feef75252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:41:25 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:25:32 +00:00
Julia Reynolds
135489a1d9 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Change-Id: I53e932f4ab8997535abe729eb36d816c40b9145a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:14:52 +00:00
Julia Reynolds
94ef1c333f [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Change-Id: Ie295579d5360bdd8b35232e2233f8f572563357e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:46:09 +00:00
Weng Su
cc53f44d49 Revert "Disallow screenshot on Wi-Fi QR code settings" 
This reverts commit 950837b20f.

Reason for revert: The security issue is downgraded to NSI, remove the screenshot protection to rollback the original design.

Change-Id: Iecaf7e4e19dc3452a7d2aeaf32bf38619e760c76
 2023-03-28 19:30:11 +00:00
Julia Reynolds
7594f2deea [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:08:05 +00:00
Julia Reynolds
f3216d6199 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I776ac765405be32ac29c0b164fd1ac4e506ecb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 17:36:26 +00:00
Julia Reynolds
cbb6811219 [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a 
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646

Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-28 16:56:07 +00:00
Julia Reynolds
9076122087 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Id968cbebe67131d2b75bc4804721faaf7ebae377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:55:16 +00:00
Julia Reynolds
1636440ed3 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I271dc0fe1a1c8bdeb6cebbda04167987f7916cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:25:16 +00:00
Julia Reynolds
0f7287271f Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I65575bb2f0bf4b82498c523f8d0b4b76628e2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 15:53:58 +00:00
Julia Reynolds
2e701b29dc Don't show NLSes with excessively long component names am: 1f3969f615 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I6316f0181d44d0d0a83f09d36d27cc4839e4ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 15:27:55 +00:00
Julia Reynolds
d152770e4c Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d am: d15a84022e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I9ec4236e79677eca89c8df3ad696b064ac20684a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 14:57:54 +00:00
Julia Reynolds
47554f941d Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837 am: 117072b9fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I577145a7a91be9b5bb199d99c7bc5f3219d878bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 14:57:10 +00:00
Julia Reynolds
d15a84022e Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Iba5bef0058876f3a717b9760811eda594a2e5d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 14:16:58 +00:00
Julia Reynolds
117072b9fb Don't show NLSes with excessively long component names am: 793257967f am: f2cdc03837 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: I16d4b3b79fb237ddd40a891da0bcb751872c3260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 14:16:17 +00:00
Julia Reynolds
cb2e6fba6d Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I398ee9f0966e462a6270bd37a8dcf5d915a5ddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 13:48:39 +00:00
Julia Reynolds
f2cdc03837 Don't show NLSes with excessively long component names am: 793257967f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: If0f7483eb6d79791ade3f8fb51e6f8852292ff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 13:48:01 +00:00
Julia Reynolds
d9604dbe15 Don't show NLSes with excessively long component names am: 90ced5d2ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Iaf70f837d7d41f485d1b6082aa2af535264de3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 13:45:14 +00:00
Treehugger Robot
e31e77f3a2 Merge "Refresh "Device details" after resuming" am: 1937737393 am: 2a7093f971 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: I0df8b25c8672bb9a6114ee132009ccf3bdddc606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 13:31:30 +00:00
Treehugger Robot
2a7093f971 Merge "Refresh "Device details" after resuming" am: 1937737393 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184940

Change-Id: I4cbeb6ab0ba569d49e2c1963df0405c953a7f29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 13:05:10 +00:00
Treehugger Robot
1937737393 Merge "Refresh "Device details" after resuming" 2023-03-28 12:42:53 +00:00
Bonian Chen
55f1970181 [Settings] User with restriction should avoid from having entries 
through Settings search

1. Avoid from generating search report when user been restricted.
2. Guest user should have this restriction but not available, add
   additional rule as a conpensation from UI's perspective.

Bug: 260860114
Bug: 235822222
Test: local

Change-Id: I63ba7f3b10fc812dd1498f17826a15e822879613
(cherry picked from commit 5e1c4d15a9)
Merged-In: I63ba7f3b10fc812dd1498f17826a15e822879613
 2023-03-28 06:21:27 +00:00
Julia Reynolds
11ac41d9b6 Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-27 16:14:27 +00:00
Julia Reynolds
79cb59e618 Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-27 16:13:15 +00:00
Julia Reynolds
1f3969f615 Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-27 13:55:41 +00:00
Julia Reynolds
90ced5d2ec Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-27 13:54:48 +00:00
Julia Reynolds
793257967f Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-27 13:53:52 +00:00
Betty Chang
df94418ec6 Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d am: 6ac664c975 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: Ia05fb646720a4b0aeee71047f1aa9cecd519a6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 15:56:20 +00:00
Betty Chang
6ac664c975 Merge "To fix the footer link is not clickable in the Bluetooth Settings" am: cc7da9e61d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2507379

Change-Id: I141e9cbef78ea7e192047d07e054f8810b376219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 15:26:58 +00:00
Betty Chang
cc7da9e61d Merge "To fix the footer link is not clickable in the Bluetooth Settings" 2023-03-24 15:01:48 +00:00
changbetty
d31f12eb4e To fix the footer link is not clickable in the Bluetooth Settings 
- Links are not allowed in footer preference title now. So follow the
   Wi-Fi UX design to add the string "Change". Let the user to click and
   go to the Bluetooth scanninng settings

Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest

Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
Merged-In: If9e666df7b987e0dbe3d550ac0af03b9d79230de
 2023-03-24 09:23:27 +00:00
Treehugger Robot
9145d7e6ce Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: I0eac72eb5e473771f4792916fb5ae2211aae1e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 02:24:11 +00:00
Treehugger Robot
9526a60e6b Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795

Change-Id: Ic2fb8afdd80cd3892aeccb45fafec6b65de1e68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 01:55:21 +00:00
Treehugger Robot
ca3aa2a557 Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" 2023-03-24 01:24:50 +00:00
Rahul Sabnis
b1e25950b8 Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously 
connected on the same device

Removes the classic audio toggles for dual mode audio devices.

Bug: 257881495
Test: Manual
Change-Id: Ie6794b4d904c74a7c5137ad141172c10188a99f9
 2023-03-23 16:51:49 -07:00
Bill Yi
3fd3c68bc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9850976bf3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203763

Change-Id: I0d1957fbd821e1f1201999f26d700a6c05ed26c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:33:40 +00:00
Bill Yi
b9446778d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb9d8914e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22203763

Change-Id: Ia334891d08bd4618c11d3a94051d03011ae11b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 18:33:16 +00:00
Bill Yi
9850976bf3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-23 18:03:14 +00:00
Treehugger Robot
ebfd790f38 Merge "Hide TTS search results if no TTS engine is available" am: 993f582fca am: 7b4a3ada12 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2493859

Change-Id: I2d16235171ced53fa97c8c0c826869267d6e25ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 10:15:59 +00:00