PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,772 Commits 1 Branch 0 Tags
58e97a474698492dc1a456471ef5d595156145cc
Commit Graph

103772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d903116617 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1f09bfbaf3df7feed03fd2585032e063626c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:22:45 +00:00
Bill Yi
471a93781b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd3d6ecae92bf38cde1fc6a83872a7ec366b73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:22:27 +00:00
TreeHugger Robot
6389cb3f8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaecdd3202593c7f84cd6e779d79cac5d4edd0742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:20:24 +00:00
Bill Yi
74507642b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d4df6d4ea79c3aa509a10574d8f041b4837e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:19:57 +00:00
TreeHugger Robot
b6a4be3395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 341a2953e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd683fee3e8d302c30946460f852e4110d54dbc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:47 +00:00
Bill Yi
0cc0806e01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: bfb7bb08ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0a9b6105e134395774500bff1f86d4f3dbfacf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:36 +00:00
TreeHugger Robot
f32c08af1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0123563e51c4dc282e0aba58fb51d08980f9d40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:22 +00:00
Bill Yi
ee38ae11ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90d9567d06f163e2e47a6ad7522f86355ecc272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:18:11 +00:00
TreeHugger Robot
56012b6bb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93430c476feecdd32599576cefe10738155909b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:17:09 +00:00
TreeHugger Robot
b30ca6974e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib62e260acff5d5752062eb6992b4aa666be6eaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:43 +00:00
Bill Yi
4970b3783e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83d9202789b11983a8bf6e1c2d157330e16c8fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:32 +00:00
Bill Yi
d3d4832f60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75373ff6bfe903e80e6eac9f016466e973474ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:16:00 +00:00
TreeHugger Robot
93a954046f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I637f9d638000e16c1ca16fb15375826069152cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:59 +00:00
Bill Yi
6944f72f53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a46b2d7667905a79a7eebbe979167545e40865c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:14:35 +00:00
TreeHugger Robot
87e365c6e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: 053bd1f8ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbbf82b813a3710d983fb667343205903f568ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:59:19 +00:00
Bill Yi
7f13849ae7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: 1025a9751f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I100b6d0889e501acf1d33a287e98d046b2c97127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:59:05 +00:00
TreeHugger Robot
0f6f7464fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc143a21e0d6640577be9a66ca467ec32e06cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:42 +00:00
Bill Yi
178808f178 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I584bcc0994dec00a847db344c5862781575c66ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:20:30 +00:00
TreeHugger Robot
e8a5cb6abf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id21a2bca3c5bf57d2afeeb77a0264f32e45ced34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:05:08 +00:00
Bill Yi
ce985a63f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc7b78ee0ea027944273035763749d0af7a4b65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:04:39 +00:00
TreeHugger Robot
341a2953e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85cd0b7257faf828bdddc4139510757047829e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:02:03 +00:00
Bill Yi
bfb7bb08ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5b2d6adaff63ca1bf03755d251d23fb99955a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 21:01:47 +00:00
TreeHugger Robot
053bd1f8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5430188911ae3f1c178a87369f7f1a20f47b1c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:49:40 +00:00
Bill Yi
1025a9751f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6c9925cdfc653205b4c4377c19848ea74eee704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 20:49:11 +00:00
TreeHugger Robot
c5148a79ad Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-03 20:49:10 +00:00
TreeHugger Robot
d802445bc2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:48:56 +00:00
TreeHugger Robot
c714da6092 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-03 20:48:33 +00:00
TreeHugger Robot
d8d5dc02d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:48:07 +00:00
TreeHugger Robot
5cc53736d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-05-03 20:47:12 +00:00
TreeHugger Robot
c63cd3cce5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-03 20:45:40 +00:00
TreeHugger Robot
43ba3f6310 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-03 20:45:18 +00:00
TreeHugger Robot
d1110a4dec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-03 20:39:04 +00:00
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search 
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
 2022-05-04 04:01:47 +08:00
Neil Fuller
3bb5fc5da8 Merge "Capitalize TZ display name strings" am: 6a44151bc1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Iaead2dab59a3641905f62c472aee78546eb312bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 19:27:41 +00:00
Neil Fuller
6a44151bc1 Merge "Capitalize TZ display name strings" 2022-05-03 19:22:03 +00:00
Bonian Chen
7ca3689b23 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: cf9ca3fbe6 am: 61c633f9a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: I0e20d8fc701e2d8ef0034f729bae2b772d328242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:51 +00:00
Bonian Chen
a277c7a641 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: d4440db4bf am: b0e84295b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I42c8bc63a1b788d33c907f2e9187d524c4c846f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:44 +00:00
TreeHugger Robot
1e3ddc9460 Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: 23dab0bb02 am: 24f5f6d56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: I70231e2631700c0b52c528e68d2bda92dc3faa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:37 +00:00
TreeHugger Robot
f606826199 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 am: eacedb46b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: Icaf417f44ab9cd94b1928fa1e7672ce2232f7902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:31 +00:00
Bonian Chen
b88cb65959 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 99724f3a70 am: b2e6fce2fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I2dc2443aa7cb9823dfb02c42e4284e8496ef1250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:24 +00:00
Betty Chang
166d876738 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: b1fa93e7ef am: d7e9bcc43f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I8b4d682f657f61dc6dbf3850a5d38d347682b4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:17 +00:00
Edgar Wang
05255129d2 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 22f7ab59c0 am: 2336ad01a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I7b0e1863257ff579131ac7d2a60323004efaac68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:11 +00:00
Bill Yi
c1eae1df36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours am: 2e250b15ae -s ours am: 7cb788de49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0c452c3dd20a02ee292c5a32b81b07b9ad8d794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:50:03 +00:00
Bill Yi
447f3eb1cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours am: 4cef0633cc -s ours am: 61f36c7be1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee56c1e74644c8de7ef8d297f05bcbef1f1da201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:54 +00:00
Bill Yi
ad0ba2cc9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours am: 5568a2692b -s ours am: b17e079014 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb22c1c2a6e61d8ea1383a2bd13874ea3bcff16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:46 +00:00
Bill Yi
f19529600f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours am: ec8ffc26f0 -s ours am: 903ddfef62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4250d03aadcfe5e620514c4afb1d2bf3ba58323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:38 +00:00
Bill Yi
bae8efd56b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours am: f93775c7da -s ours am: 9f7053b7cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I722b82827edb811a756a01d342cf1935baff8ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:32 +00:00
Bill Yi
96f5c08a27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours am: 38e89c3879 -s ours am: 0463d9f61c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82f80b9a101343801407c070d4bdbdddb7b54c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:25 +00:00
TreeHugger Robot
160657c210 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours am: e6ecfff870 -s ours am: 2f66f8b08b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5986f35f949cdac39969740cf1583647fb38d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:17 +00:00
Bill Yi
24e53cf988 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours am: c0bf62368b -s ours am: 490f9dd7f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e819224dc59ff3e132ed4898b48fee99dbc5caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 18:49:16 +00:00