PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,480 Commits 1 Branch 0 Tags
adc7eb052460d5d25a2684d08520019fb99b278f
Commit Graph

127480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roy Chou
e3e8c9b464 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: 0bdc6ad2a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I4b6f189fb36ca1158bea5a62616a580507bf46db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:24:14 +00:00
Avinash Vadlamudi
bf3c9ee918 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 am: 0cf38ac8e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I06af187b9469a427aaac7e0843891afbaa592046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:24:05 +00:00
Roy Chou
f482ff63b9 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I23d2fec9ab12741fd35ca1ff130e8ec8a97f58e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:23:24 +00:00
Avinash Vadlamudi
071db861a2 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I293ee9f3f23ac0a49cce228e3febf3475f86282e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:22:44 +00:00
Peter Zhang
492b29dcde Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: ed0af59d60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: I1ee1b84b386b403db7e0dc43e0bc96482405fa64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:20:19 +00:00
Roy Chou
0bdc6ad2a3 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I5da848212d422435a6976798d203fc03ee3eb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:16:25 +00:00
Avinash Vadlamudi
0cf38ac8e0 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I6d9a618e64a45b1c1fb203a92b7867349a7ca9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:12:52 +00:00
Roy Chou
32a2e30074 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I80f2e8be3febfbea65c3d653b1d01531f3fcbc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:03:17 +00:00
Avinash Vadlamudi
ee54053ace Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I9208f1f39cfcdd034968f0fe193e95ef28146c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:02:37 +00:00
Roy Chou
412c248c10 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev 2023-05-12 16:59:26 +00:00
Peter Zhang
67f1dbb2bf Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 am: 79a76c9b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Ia8f44e32844a2d2f21b6ad71d82fdf662d06b925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:59:06 +00:00
Peter Zhang
8b7482cb5e Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: 521e527edd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: Ibaf7c82f601b1e4ccc41821cd669ff687a5d596c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:57:54 +00:00
Peter Zhang
fbcc7d6ad2 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 am: 4d0120712f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Ie02be26b76bc48e90a779d9b50140a89d4039eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:55:47 +00:00
Peter Zhang
ed0af59d60 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: I7b99683979a3f0ba992d4a19534e265dc9facb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:55:46 +00:00
Peter Zhang
521e527edd Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: Idc8edb4b38ee723e23f8b0460050c0b9fa41c447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:52:48 +00:00
Becca Hughes
400e5491a3 Add extra null checks 
Test: ondevice
Bug: 281047738
Change-Id: I07ced78af5da086433aa4288949673161bfe4f20
 2023-05-12 16:46:30 +00:00
Peter Zhang
79a76c9b5f Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: I53645ee6b0356cb623e2e55a69b0f42d960bd751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:39:45 +00:00
Avinash Vadlamudi
28cf617ca2 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev 2023-05-12 16:34:26 +00:00
Peter Zhang
60069d3039 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev 2023-05-12 16:22:38 +00:00
Peter Zhang
4d0120712f Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Id6b3de9b4ea52e3f039d963a8c048f1c5096cf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:12:51 +00:00
Peter Zhang
04545138c7 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev 2023-05-12 16:09:34 +00:00
Jason Hsu
0c2efc6c48 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 am: 264071adcf am: dbfdb72f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I80bc52152cd7d29390b5c04cc2b841550951e0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:02:52 +00:00
Roy Chou
0aa67ede68 chore(#AlwaysOnMagnification): hardcode the feature flag default true 
Set the feature flag getter default return value to be true to rollout to public. We keep the checking code so that it's still remote controllable.

Bug: 281788002
Test: manually test with adb command
Change-Id: Ie7f32721cf99d8a97c11f0f9c6d0d466c083d668
 2023-05-12 15:57:56 +00:00
Jason Hsu
dbfdb72f3b Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 am: 264071adcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I686bd5d61359508af2dee0304db1b5add2f62a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:46:07 +00:00
Jason Hsu
4d22f2a86a Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 am: c783497e05 am: 144a851dcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I302e79d82ec9c819b518dc9fb687016a5703bebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:46:05 +00:00
SongFerng Wang
0a97cd3478 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d am: 857464e9d5 am: ddecd863e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I0342dfb66d5e96e5167e7873f90d3b5edd532a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:44:44 +00:00
Chaohui Wang
a3b8a4c4ad Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 am: e7ef6d181b am: 1092789aa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I160bf7ba0163f32bf7ab4c3bd915d2cb20a95d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:44:34 +00:00
Jason Hsu
b7de37a4aa Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c504d93894 am: c92052d2c3 am: 5e0e2ae715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I40c4aa8d6bad927ef24bb300e42b19c5804e272a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:44:25 +00:00
Jason Hsu
5d7ef0f6a8 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 4ea92477bb am: 7eacba1d46 am: 6b1ecb4492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I1c13c4e38dc0cd9f3e43b9d07aab620f8fa61c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:44:13 +00:00
Jason Hsu
9994a2b647 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 am: 9a4c3228a3 am: 67ac8e4b9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ie6b474ea5a9ae327d9bfd356f7c647da43a942af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:43:56 +00:00
Jason Hsu
cc07657275 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 am: 97d7422278 am: 9ba9527fb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I915b1444c489003ed9702cd6bfbf47b753eb9dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:43:43 +00:00
Jason Hsu
144a851dcf Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 am: c783497e05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: Id85b3e7e8b9008da60026a224de881d2544b9160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:37:06 +00:00
SongFerng Wang
9525e94d90 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d am: f7b152e9f3 am: d6c6616dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: Ia59eee682e732703e3148acd753cdd7ae4c49186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:35:37 +00:00
SongFerng Wang
ddecd863e7 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d am: 857464e9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I0460a97706067467378b63c0ab5a67c49a22ad1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:35:32 +00:00
Rubin Xu
5b42447d29 work challenge: allow backgroud biometric auth 
We observed a race condition that when work challenge is launched from
notification, the biometric prompt quickly dismisses itself because
it detects the launcher is now the foreground app. This change attempts
to workaround the issue by enabling the setAllowBackgroundAuthentication
optin in BiometricPrompt so it no longer dismisses itself even if the
foreground app is different.

Bug: 279766640
Test: manual
Change-Id: I453b7d603c6eb65f329afb38d8a190e21a7e4c01
 2023-05-12 16:35:15 +01:00
Chaohui Wang
1092789aa1 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 am: e7ef6d181b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I51b7913f8a983d84d519fa8429e22c2a39c0b53d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:35:00 +00:00
Chaohui Wang
9ae0a9f9a1 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 am: 8296309b46 am: 3ac90c5727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I2fff5886e46574356d8896b34c3bcce78efef5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:32:21 +00:00
Jason Hsu
5e0e2ae715 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c504d93894 am: c92052d2c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I940dd05134239de744fcac801676319af661ba23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:28:16 +00:00
Jason Hsu
6b1ecb4492 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 4ea92477bb am: 7eacba1d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I0183faaea4bff9b648109bc86de99769aef2ce7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:28:05 +00:00
Jason Hsu
67ac8e4b9f Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 am: 9a4c3228a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ifaad45b39c55db4200515bcfcfff5ba7dbcf40ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:27:55 +00:00
Jason Hsu
9ba9527fb4 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 am: 97d7422278 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I82da4c74c20b8f604613537b8744ab15ba45b0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:27:27 +00:00
Jason Hsu
c92052d2c3 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c504d93894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I6555b7ba78411bb3d6c0d8188f27a7ab3e52d981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:11:14 +00:00
Jason Hsu
0522dc9b9d Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: 4714fe7a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I4716ac5fc704aa4b6491e3df1a4f74128a97c339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:10:56 +00:00
Jason Hsu
7eacba1d46 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 4ea92477bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I3fddce5cfa38058b277ba75c9518ae9e9291c2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:10:49 +00:00
SongFerng Wang
d6c6616dee Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d am: f7b152e9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: Ic08e6a0d311bcb0147d75611ba7df03f3a83668d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:06:19 +00:00
Chaohui Wang
3ac90c5727 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 am: 8296309b46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: Icdba14edebbf914279bbf21fa7e5b791cc268e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:06:10 +00:00
Jason Hsu
4ecbb9c13c Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 3f6e93beea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: Ic1ce1c748c2ee749b4a73256a8d850df1232bb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:06:05 +00:00
SongFerng Wang
fc5a83c500 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 599fc1a314 am: 1815aa2460 am: 4c73dde073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I0f6738b42690f9db8ccc25e757c7829a89011284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:02:23 +00:00
Chaohui Wang
67680a7608 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: a896e1f3e9 am: 47b4c83215 am: 72c8c81d71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: Icba893f59c1d956a94d304349e848d93eb3e5be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:02:11 +00:00
Treehugger Robot
b0c2e88f00 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: 2318405bcb am: 8ee78e05e7 am: e1ba18cbd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I5ebc2605ed55563850a8c65c4e18365ff327a29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:01:58 +00:00