Chaohui Wang
09c631eb01
Update activity name for ManageFullScreenIntent am: 94906cfe3d
am: 22b3c0462f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: I64bd83bc46de6fb969a0ee01c08367096c9fa600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 03:38:56 +00:00
Chaohui Wang
d8f569dba5
Update activity name for ManageFullScreenIntent am: 94906cfe3d
am: 1d7e22ee3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: I3f83cfe633a88ac1362aaac4c8972b6d368eb3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 03:38:38 +00:00
Chaohui Wang
93d86268e8
Update activity name for ManageFullScreenIntent am: 94906cfe3d
am: baf7e7e2a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: I1a63eb36f333a3ffc0e663fbfc69414ff1d62402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 03:20:58 +00:00
Chaohui Wang
1d7e22ee3a
Update activity name for ManageFullScreenIntent am: 94906cfe3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: Iff1262707d748b08ce5818b0e9d558026d877502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 02:37:28 +00:00
Chaohui Wang
22b3c0462f
Update activity name for ManageFullScreenIntent am: 94906cfe3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: If08b27be6aaa9df2544040a00dac88620de40e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 02:37:25 +00:00
Chaohui Wang
baf7e7e2a7
Update activity name for ManageFullScreenIntent am: 94906cfe3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206
Change-Id: Iab8361606bdb337c987498784f648da4b80e7a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-30 02:33:09 +00:00
Chaohui Wang
94906cfe3d
Update activity name for ManageFullScreenIntent
...
Bug: 243421660
Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac
Test: m Settings
Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent
2023-05-29 17:11:08 +00:00
Bill Yi
9b9b56de09
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I449a70434b8159ca38dc0456b8f2d6a36af14a0c
2023-05-29 05:13:24 -07:00
Hao Dong
7ced7a7cbd
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
am: 81587b1864
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521
Change-Id: I47013f77ec1436048a41afbba34bdb4eeaa6ac6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:32:26 +00:00
Automerger Merge Worker
53123edb29
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387
am: 18af57da3e
am: 3408ac49ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: If97f506b4969c7168873adc9c8f2cd8688a04347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:17:13 +00:00
TreeHugger Robot
693a6dd6a1
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
am: a6f32e2cb3
am: 4881a81aac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I746ba3dc1acaf707cab50c94a6a54a2502627aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:16:14 +00:00
Treehugger Robot
a9b1f08518
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
am: 67b9234806
am: 8e74f78dc3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I732bf38d281fe1180b588d0e53bb0d19d3173831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:16:02 +00:00
Julia Reynolds
10361356db
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
am: f27723619a
am: 0b768d10c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Ifbc14e272e562e975f03936360779b07989cb0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:15:45 +00:00
TreeHugger Robot
35bce8b1f6
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: ba5bf3e18f
am: 081b525ba5
am: 0701b5ae08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I80e882a52437b2471239a45b0db5d4091a0a69ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:14:32 +00:00
Treehugger Robot
238d30de6c
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f8b14c6049
am: a451e2cb2a
am: e9fd47eda4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ieba28efc7935d5fa87930249d7016f6cae43a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:14:23 +00:00
Julia Reynolds
e669ead856
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 08145209c6
am: a4d98455c9
am: da5f294f40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I1b7ce999b5814de175e9ca9d065bf8518600f7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:14:02 +00:00
TreeHugger Robot
f547405e24
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
am: 6e9b0d97da
am: a14d53163c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I26ba6516c4eac5449ea468b5a6ed5a4853d97297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:13:03 +00:00
Treehugger Robot
ff3165da2e
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
am: 9abd002f0c
am: 0934c3e881
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I6d58a9fd4da5debe8ba49cde4932510963abc073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:12:54 +00:00
Julia Reynolds
92ba38b053
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
am: d9cc409fca
am: 6ff2b3296c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I98784ba783efd030f9e8630d822cc455f873d0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-27 00:12:31 +00:00
Hao Dong
81587b1864
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521
Change-Id: Ifd0ca0b6881b2e8d0ff8f57e9fa4876208f9e520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:05:55 +00:00
Automerger Merge Worker
3408ac49ea
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387
am: 18af57da3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I40bb30e4616d6755cc03d5d9fa0950cd82ef9e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:05:01 +00:00
TreeHugger Robot
4881a81aac
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
am: a6f32e2cb3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I3987ff735c19972c965e8502fcc0b90d32d8c302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:04:49 +00:00
Treehugger Robot
8e74f78dc3
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
am: 67b9234806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I895759538a49ec9cfe59ddb7dedf8360f2a45df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:04:41 +00:00
Julia Reynolds
0b768d10c5
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
am: f27723619a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I4ba2a5b636881af0593d645c3f8111c77d806d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:04:32 +00:00
TreeHugger Robot
0701b5ae08
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: ba5bf3e18f
am: 081b525ba5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: Ib5d4956b7341a33baf552680a8989b5dcbfd29aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:04:17 +00:00
Treehugger Robot
e9fd47eda4
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f8b14c6049
am: a451e2cb2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ifa2e4dc558e55d385f0cb4733e0754f766f4aae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:04:08 +00:00
Julia Reynolds
da5f294f40
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 08145209c6
am: a4d98455c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I21e6fe2a648f33dd5ee6ee2fb04ebcdbf571fc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:03:57 +00:00
TreeHugger Robot
a14d53163c
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
am: 6e9b0d97da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I93be3c2d16321bacec5253332a6dc83e4e0b2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:02:34 +00:00
Treehugger Robot
0934c3e881
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
am: 9abd002f0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I38e0b893872feca32d26aa62f48b2f1e69f8e9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:02:22 +00:00
Julia Reynolds
6ff2b3296c
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
am: d9cc409fca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I548af73340c2a3a3d5c8e32c85e39289859e7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:02:09 +00:00
Treehugger Robot
83e13d5cec
Merge "Shorten the Accessibility shortcut tutorial string for button settings."
2023-05-26 21:06:53 +00:00
Hao Dong
6cb1f9401d
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev
2023-05-26 20:35:34 +00:00
Automerger Merge Worker
18af57da3e
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp am: c2b075b387
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I035428529ea1c0815d15614f97f28ab956f8a8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:23:59 +00:00
TreeHugger Robot
081b525ba5
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: ba5bf3e18f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I03e4f57164e78e90edc8e578d383654438ba5a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:48 +00:00
Treehugger Robot
a451e2cb2a
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f8b14c6049
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I472a9b27cc33bd5adb55cc115502c3c54195feb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:22:02 +00:00
TreeHugger Robot
a6f32e2cb3
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I343c82faae3d9fb135d4e9e500923a3fec91de4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:45 +00:00
Julia Reynolds
a4d98455c9
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 08145209c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I0f879939b4a94eb7d5ac387826801cc9188203aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:41 +00:00
Treehugger Robot
67b9234806
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ib5975d1e338250b7468f3e37650094eeb5244bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:34 +00:00
Julia Reynolds
f27723619a
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Id39f2abef660120d8dfd2904af5b27d41ac5b38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:19:48 +00:00
TreeHugger Robot
bb92abb0ae
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 5c238c0f5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I8eb5dffe4b0bdef9cdfc8d37b5968c301d04e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:53 +00:00
Treehugger Robot
eff0680f84
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: f483a19888
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: Ib4a95a02a1ab9dae837d795c3721f0357746a395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:44 +00:00
TreeHugger Robot
6e9b0d97da
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I150a607f7d37f89224ab2aa0aadad7d2242ecbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:40 +00:00
Julia Reynolds
4ebb8712d5
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: d94d3eb622
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Ic152cf64d0dcbf3f25bcb5c132097dc8302ea757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:34 +00:00
Treehugger Robot
9abd002f0c
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 24db1f3393
am: 424440670d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I0cd780aed67bbe0560f5057fc430fc144b9f1f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:32 +00:00
Julia Reynolds
d9cc409fca
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Ic06bc743e3903e60b8e1bcdb67ed655518df4fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:23 +00:00
Automerger Merge Worker
c2b075b387
Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2" into udc-dev-plus-aosp
2023-05-26 19:57:28 +00:00
Treehugger Robot
c93a4e7875
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
am: 2bb637fcc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: If0f46143aa0c2b4ad9ede55a21282f55b564a909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:57:22 +00:00
TreeHugger Robot
ba5bf3e18f
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: Iafaadf2f8338b5bc52de8323787ce1c6926ad92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:57:20 +00:00
Daniel Norman
cbea2f8d35
Shorten the Accessibility shortcut tutorial string for button settings.
...
This should hopefully lead to shorter translations in languages that use
more characters than English, and also helps already-short translations
fit on one line when using maximum font size.
Screenshots:
- EN, default font size: https://screenshot.googleplex.com/4aDxShGtQ5Bnz2E.png
- EN, largest font size: https://screenshot.googleplex.com/83ovdiUBAwXgmNw.png
Bug: 284035025
Change-Id: Ie08b3fe9b741acf7d90c8fa306a336ce1b6f4bd9
2023-05-26 12:47:30 -07:00
TreeHugger Robot
1efd1f6d3c
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:13:08 +00:00