PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,403 Commits 1 Branch 0 Tags
e4f376f7ef302a91665fa27dbab2c1ce6808081c
Commit Graph

123403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Dmitrii Merkurev
d7d4ec224f Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE 
Currently factory reset action is ignored if
PERSISTENT_DATA_BLOCK_SERVICE isn't presented on device.
Make sure that we can execute regular factory reset without
it by utilizing the logic from shouldWipePersistentDataBlock.

Test: manual verify on aosp build
Bug: 129137473
Bug: 196634851
Change-Id: I2abcb93cbc0872dd920c1dd62152596ddd723691
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
 2023-06-19 21:06:25 +01:00
Chaohui Wang
6bceb29408 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 am: b1231c5f15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I936a6e4a4f24a7f8c238662ec09a02f7a3e985e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:36 +00:00
Chaohui Wang
b1231c5f15 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 am: 7fdf1c4b17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: I9e87eec0995e9dde010a51e3a7ccbaf68839a696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:56:38 +00:00
Chaohui Wang
7fdf1c4b17 Merge "Update the OWNERS for bluetooth & connecteddevice" am: 6b2f2ab205 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629910

Change-Id: Ia337805f374b7c05bac8902ff9add84ced999f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:17:09 +00:00
Chaohui Wang
6b2f2ab205 Merge "Update the OWNERS for bluetooth & connecteddevice" 2023-06-19 08:29:54 +00:00
Chaohui Wang
85c1dea20a Update the OWNERS for bluetooth & connecteddevice 
Bug: N/A
Test: N/A
Change-Id: I72b4b6f47586b2dd13cfcc4a642c817c93e4ded0
 2023-06-19 07:35:20 +00:00
Julia Tuttle
b23136041d Fix colors in importance and conversation priority preferences 
This would have been simpler and faster, but the ChannelPanelActivity
was giving me a context where Material colors always inflated in light
theme even if the device was in dark theme, so I had to work around it.

On the plus side, whoever next needs to change these colors will find
them neatly organized in themes.xml!

Bug: 284380876
Test: manual
Change-Id: I2eee877fe44d307a96d60168d0317444ff002669
 2023-06-16 19:17:09 +00:00
Android Build Coastguard Worker
123dd375d8 Snap for 10331563 from 08366227b5 to udc-release 
Change-Id: I5ea1314b00bd881d463dcccd6575b6f0b7bfaf8b
 2023-06-15 23:20:16 +00:00
Treehugger Robot
c14daa817b Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723

Change-Id: I1e96376f6aec9cce89f71117474bace2d1364505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 12:06:30 +00:00
Treehugger Robot
2d23561a25 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 11:44:07 +00:00
Treehugger Robot
08366227b5 Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev 2023-06-15 11:18:51 +00:00
Treehugger Robot
2010c175a6 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:33:50 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:50:45 +00:00
Treehugger Robot
a3f9f42b71 Merge "'Mobile plan' is searchable even if it is unavailable" 2023-06-15 08:57:32 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2) 
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
 2023-06-15 14:38:59 +08:00
Android Build Coastguard Worker
fee5a44693 Snap for 10322758 from 42339b4e56 to udc-release 
Change-Id: I7bc1d038ae646bde659075336e9a318f87712459
 2023-06-14 23:19:09 +00:00
Matías Hernández
dfef40cb74 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8aaec15d21be327b17e6a2645ef04ac431633afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:55:17 +00:00
Matías Hernández
5a51d41a4c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f6a9dd6f7ca79d0c34386d907282b4870c9ccc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:13:14 +00:00
Matías Hernández
2f1883c397 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98a1c7f24ecc89b74dae1d1edcee9bdf0bab335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:09:45 +00:00
Matías Hernández
5a43ab914c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I721a9e800419dbb55903f02021734b741c1fec95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:09:33 +00:00
Matías Hernández
42339b4e56 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I103eab934503369ef57e0e76b50e3cd299b75e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 18:08:32 +00:00
Matías Hernández
85cad88256 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbc950729fb38065185e73d74e6e5f86f85865bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:26:05 +00:00
Matías Hernández
ed1b91ffdc Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: bbfe425326 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I5eb0d7fef7ecf45c9cd471d3298150445bc84ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:22:52 +00:00
Matías Hernández
41d3ecca1c [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I557b5bc86b14e222cbe5624504ac3cd34ff0124d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:22:29 +00:00
Matías Hernández
14ddd8b659 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e9ff332c0169848a83062c594bb07b30151e9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:40:44 +00:00
Matías Hernández
14c85fff7d [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66d2231c067713b55984bdf74d66af9cb9252295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:39:55 +00:00
Matías Hernández
68a0fc9469 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I54c9ea046a533d24fb36403c0e2aaf632708b752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:39:35 +00:00
Matías Hernández
33e5518af1 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Ie91f13e1b27753177e9bd7f7b88e9f2821cdada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:38:43 +00:00
Matías Hernández
bbfe425326 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I1f7f948108f6f3e9a0ca2f978aaf1847c7c3e496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:38:15 +00:00
Matías Hernández
a820fd4bce Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: If19c009fc524190d8c3a7cf09240b4af6a2fbcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 16:37:06 +00:00
Matías Hernández
46cdbed02e Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I91e72e84a4f239501953dbcf048f6043ea588ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:55:36 +00:00
Matías Hernández
dcbe38baa9 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I69d2ef43afb54ce3b9d141d4f676b688dd1c5c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:52:58 +00:00
Matías Hernández
897c8321a6 [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8136b7f814d25c104f28ebf4714b0f814bdc9d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:50:49 +00:00
Matías Hernández
d185f3aebf [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9944714c4b97d46b20f78ecd02b875aa21672ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:11:01 +00:00
Matías Hernández
0166bcc776 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I33040a000b1bc4e90b9e76c8e751bca2e09959d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:10:59 +00:00
Matías Hernández
2b1faa0aea Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I715da9406bd9d3fe88ff7b5353db1780109880e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:09:53 +00:00
Matías Hernández
b971690a4e [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26937792ea087b7b2516e71525fa12602d312696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:26:51 +00:00
David Magno
50e8eab484 'Mobile plan' is searchable even if it is unavailable 
'Mobile plan' yields a search hit event though the 'Mobile plan'
setting is unavailable on the device.

Bug: 287198186
Test: Manual
Change-Id: Ibc6f01602a364ae902f8a6ce15083890e89446d2
 2023-06-14 16:25:27 +02:00
Matías Hernández
0aa241be99 Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I8cd7cc9605b3728f9f96c3479d17aa1b362d9cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:22:10 +00:00
Matías Hernández
a49e14f8ff Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I840d7836ae899bcd40eafc772b96c9460c3f8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 13:42:07 +00:00
Matías Hernández
78a4048eac [automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifee74173a3e0f410d4d76f06149b496a9ae62241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 13:40:43 +00:00
Matías Hernández
50df60c93c Don't hide approved NLSes in Settings am: ff255c6eda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: I42099e38ef7b479b9339b545fe8d12d3bbe95112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:57:15 +00:00
Matías Hernández
d7608c84b4 DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 12:52:41 +00:00
tom hsu
bcd6bf1f8f [Settings] Fix roboletric test fail and add new test case. 
Bug: 287177689
Test: atest passed
Change-Id: If927f4e4bf7ee9702e865e77f350164a93729940
 2023-06-14 10:13:55 +00:00
SongFerng Wang
7f29649aa9 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I278260f1a36ed24fd1ca2d53ffc7ff2431fd1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 07:54:48 +00:00
SongFerng Wang
61ef9024c8 Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: I9b061b1c90bc7033e4400d192ed5211e9ea9bb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 06:20:17 +00:00
SongFerng Wang
448c8b61a8 Merge "Remove the owner" am: 286344d539 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772

Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:36:47 +00:00
Treehugger Robot
e2ee732578 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c -s ours am: ee8cd42af0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4c331a763becd473d4fcb399e1d548c1fd1a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:09:36 +00:00
Bill Yi
a49576b187 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6 -s ours am: 4368d3a79a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28779f4e321c73a8ddf81f0a9c0659359e5c9a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 05:09:32 +00:00