PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,708 Commits 1 Branch 0 Tags
454698d97e8c901bacd53bfa5c56f8a93e4547fa
Commit Graph

95708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c3f5320225 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: 3fa671bab4 -s ours am: 3c18081292 -s ours am: 87cdc11a39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bb0eed721fefa91f0410243655d558f3eebd265
 2021-09-20 15:11:28 +00:00
Bill Yi
c8a5df72cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 610ee5240d -s ours am: 1eb125f2b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47f2c3bc97eaaa2db18c221345ce54235527c074
 2021-09-20 15:11:18 +00:00
TreeHugger Robot
88489e03a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours am: e860099488 -s ours am: 25a2a58fa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbc2e48764f8255fa944247cf28379a17a8196b2
 2021-09-20 15:09:55 +00:00
Bill Yi
216ce27f47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 34bbccd412 -s ours am: 6ad471e64f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5f3265650ce75df270a3e58b729cb664026fc26
 2021-09-20 15:08:31 +00:00
Bill Yi
80e2f3e35d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 6280ce466c -s ours am: 56578f0ea2 -s ours am: b5ab618a36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15b69f11a9256466cabd01fa7544d5a20985cf19
 2021-09-20 15:06:39 +00:00
TreeHugger Robot
d9015e0e70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours am: 2e1b4f12c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib22874dfbb313ad153087a48b6834947c004880c
 2021-09-20 15:01:02 +00:00
TreeHugger Robot
87cdc11a39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: 3fa671bab4 -s ours am: 3c18081292 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56f83a34ac65b2a7d4ae6c479d6f180389932e2
 2021-09-20 15:00:46 +00:00
Bill Yi
1eb125f2b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 610ee5240d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8881900b12a83e6561040f69b3d84369e486c518
 2021-09-20 15:00:04 +00:00
TreeHugger Robot
25a2a58fa2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours am: e860099488 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09cf2a67c440dde9ca9e4fee25a082af17fb79f6
 2021-09-20 14:59:16 +00:00
Bill Yi
6ad471e64f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 34bbccd412 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I950f4e11b6b37d14a9b72c2c40363cc6b558aab8
 2021-09-20 14:58:47 +00:00
Bill Yi
b5ab618a36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 6280ce466c -s ours am: 56578f0ea2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17af9bc7571c539ab40bac6813bbc64c935cea65
 2021-09-20 14:57:43 +00:00
Victor Chang
fc4589448b Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest 
The time zone transitions can be obtained via the public API
ZoneId.getRules() instead.

Bug: 119751170
Test: atest SettingsRoboTests
     com.android.settings.datetime.timezone.TimeZoneInfoPreferenceControllerTest passes
Change-Id: I2c7864580b2a36b725ee250253e97f6cc86d72a4
 2021-09-20 15:57:42 +01:00
TreeHugger Robot
e860099488 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e0c0cc8b8fc1390510ee4bb22040eca634f1481
 2021-09-20 14:45:17 +00:00
TreeHugger Robot
2e1b4f12c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I711c1899c421ab095616b208c4f67f0128967e5b
 2021-09-20 14:44:46 +00:00
TreeHugger Robot
3c18081292 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: 3fa671bab4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2d4869b3f97a66f5697a3a6fcd706b9b6513669
 2021-09-20 14:44:39 +00:00
Bill Yi
610ee5240d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie796e678663113dd77dd81e57e6162ad9b14c1f8
 2021-09-20 14:44:36 +00:00
Bill Yi
34bbccd412 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3dea5f12e5769d7910f9cbd813b6e89c1a33afdc
 2021-09-20 14:44:19 +00:00
TreeHugger Robot
c78cabf433 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: a1cce1a07c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e8f98c4fc4402751f71b86cef01b4dbc6d2a8fa
 2021-09-20 14:44:14 +00:00
Bill Yi
56578f0ea2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 6280ce466c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1eaf564aee23c4a00d10204a8b9abce90160e374
 2021-09-20 14:43:43 +00:00
Bill Yi
62cf39bc5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 6a926cd911 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia30164f620be00d437b5ef290881fc206396b18e
 2021-09-20 14:43:00 +00:00
Weng Su
caa29d401b Minor change to Wi-Fi WPA3 password length restriction 
- Change the maximum length limit to 128

Bug: 200305860
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: Ia739dab35da75c73e28077ccc81979253def6128
 2021-09-20 22:38:29 +08:00
TreeHugger Robot
b65f46dce2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee57b257fde74ff26a1f5761c999e71f9ee3c809
 2021-09-20 14:30:15 +00:00
Bill Yi
79c2a1e72e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e3eaaf2db60a51fd7a6d7ea0a4f7366c036a147
 2021-09-20 14:29:29 +00:00
TreeHugger Robot
3fa671bab4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadbd3da5a10bed29a0988acf9c64fbb54614b451
 2021-09-20 14:29:18 +00:00
TreeHugger Robot
a1cce1a07c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I317762db18afedca19e671704654570d498852d1
 2021-09-20 14:29:15 +00:00
Bill Yi
6a926cd911 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a9396bfd0bc8b4ace1cf50e27079797fd9314ed
 2021-09-20 14:28:33 +00:00
Bill Yi
6280ce466c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02500142f53249a3f17b775d14baca98c3c60a14
 2021-09-20 14:28:32 +00:00
TreeHugger Robot
8fc132c073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If21bd8380189f5615c8531bab311cbb7847742d7
 2021-09-20 14:16:53 +00:00
Bill Yi
977610714f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc00c683438341c8024aa8050982745a71f32840
 2021-09-20 14:16:34 +00:00
TreeHugger Robot
7a8b043da7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-20 14:04:47 +00:00
Bill Yi
1c7af0a1cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: bd4c0ff5eb -s ours am: 9440aa4378 -s ours am: c19d9c96c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife4d1fb6a3fcf3eab2b0a110a9de96182d4c613a
 2021-09-20 14:00:51 +00:00
Bill Yi
be1a8ee3a2 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f am: 82e2ee2a19 am: 82ff199ad6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: I9655d1d0a848c5ab7a5cb99e37ae47315e5f7333
 2021-09-20 14:00:39 +00:00
Bill Yi
352caddfd7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 8e9c812e54 -s ours am: 2dda71d5a4 -s ours am: 1b62d44530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0f7adcd818b29bbf67cc96d7660a3447357959f
 2021-09-20 14:00:38 +00:00
Automerger Merge Worker
1c9e6c951f Merge changes from topic "am-f6977f162413434b9b6d152bf7a8ae79" into sc-v2-dev-plus-aosp am: c0e89c29e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: I91f3ba8ea31c89439fb2e9cad54620bccc022c81
 2021-09-20 14:00:21 +00:00
Bill Yi
ba7b7b6db9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: b50c2b8618 -s ours am: 3352a113f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1b430a6f302f2388e954345ca9ea6f30bad3fff
 2021-09-20 14:00:20 +00:00
Bill Yi
bbefc5aa77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: bd4c0ff5eb -s ours am: 801bcbf545 -s ours am: 7e6599c614 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I829ebb2e6fd34b5ebc00e8b38d42e014934d7390
 2021-09-20 13:59:56 +00:00
Bill Yi
52f746f1a1 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f am: 523f18b4eb am: c07efa7cfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Ic4f065f8b5ade69d3bef2f5d5118c8a45c712085
 2021-09-20 13:59:50 +00:00
Bill Yi
86935627b6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 8e9c812e54 -s ours am: dfbbc071c2 -s ours am: 561b78152e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c0473800f918beea993c616145291297053d5f4
 2021-09-20 13:59:49 +00:00
Bill Yi
cb4022a78b Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84 am: 5f9d29ac41 am: 2e67fd2b8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: Icf4d434612d3424f6a50ef038ea322caa1c04e07
 2021-09-20 13:59:27 +00:00
Bill Yi
4e7b6ed0e5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: ae2e00e1d0 -s ours am: 7dcbfbd0d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b4f93cae42f4ffd0c1c08bc879303c6156682ff
 2021-09-20 13:59:26 +00:00
Bill Yi
3fd3850821 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: 2cf7817de7 -s ours am: 78507d697d -s ours am: 65992373b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a223de47ad513cbb4f07620f225f71af9669fb8
 2021-09-20 13:59:10 +00:00
Bill Yi
e0616317af Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp am: 6bff29a287 am: 24dabad62e am: aa7a1362e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Id64d3549e7646c34f137e8758da6e521f5ba6daf
 2021-09-20 13:58:46 +00:00
Bill Yi
a7add5dbee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 6c50635319 -s ours am: 39f5c07a46 -s ours am: 10f66958a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied165641ab5f45947e98a8a1315c95dc02732752
 2021-09-20 13:58:45 +00:00
Bill Yi
43ca32d28f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 15c729b335 -s ours am: 7159a65e51 -s ours am: a8bb61fd6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83756328848ffdbb41df14ea28a1b58e2fb63dc3
 2021-09-20 13:58:03 +00:00
Bill Yi
c19d9c96c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours am: bd4c0ff5eb -s ours am: 9440aa4378 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifadc29d28b1b4c6a55fc5f9695a074e35549f6de
 2021-09-20 13:43:34 +00:00
Bill Yi
82ff199ad6 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-qpr1-dev am: a24dbc064f am: 82e2ee2a19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860617

Change-Id: Ie96faf70255322f537b8f270a444d5a4cf1e14fd
 2021-09-20 13:43:29 +00:00
Bill Yi
1b62d44530 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 am: 8e9c812e54 -s ours am: 2dda71d5a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I091335e2e231f1f3f24fdc93aba7e5e7344e7515
 2021-09-20 13:43:28 +00:00
Automerger Merge Worker
c0e89c29e6 Merge changes from topic "am-f6977f162413434b9b6d152bf7a8ae79" into sc-v2-dev-plus-aosp 
* changes:
  Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84 am: 488e676e07
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: b50c2b8618 -s ours
 2021-09-20 13:43:24 +00:00
Bill Yi
9953aadfa5 Merge changes from topic "presubmit-am-466b6fd298554aadaa7035f3de4bc739" into sc-qpr1-dev am: fb733b7d84 am: 488e676e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860621

Change-Id: I0705a1dfef63722cff672849b45c8c8daa2db666
 2021-09-20 13:43:21 +00:00
Bill Yi
3352a113f0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed am: 13cb0a15ca -s ours am: b50c2b8618 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida15bc27882efb4c81cad953cceb8cb7ba3b7180
 2021-09-20 13:43:19 +00:00