PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,975 Commits 1 Branch 0 Tags
c843f15d2eddbdd2dc045d1398b8cd8023c985cb
Commit Graph

111975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
fd99fa9354 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: Ie72ff5a356830d2f5f60b306e39ffef6d29d0c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:43:41 +00:00
Bonian Chen
a40112328c Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e9cdc176a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:43:40 +00:00
Bonian Chen
67556fac04 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:43:37 +00:00
Bonian Chen
6656965314 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: d1e0f81da1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I5d1266fc05ca1c7ab3fae2f11980e1a18d8d506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:42:58 +00:00
Bonian Chen
e941740b35 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:25:48 +00:00
Bonian Chen
d1e0f81da1 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I0913549f6c94ddb994092377f2be48d3e7641d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:24:43 +00:00
Bonian Chen
e9cdc176a6 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:24:20 +00:00
Oriol Prieto Gascó
c335003db5 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 9302caf862 am: 35b80d9a8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I066e590ad3152529c9d891e7682d2907d501630f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:19:42 +00:00
Oriol Prieto Gascó
65786fd291 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39 am: 50911db0c3 am: a3714708a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I9e16e8dd131398191cf2d835d389ad0ff5c6637c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:17:52 +00:00
Oriol Prieto Gascó
c1f5037116 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 95d32d678c am: 7e7df0d9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ia19d60b61eeb6e8d1511f3ab22a8156eab43a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 19:13:42 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
35b80d9a8c Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 9302caf862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Id26b9533bab3586cc1ddc779e61450bbe0428314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:41:16 +00:00
Oriol Prieto Gascó
a3714708a4 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39 am: 50911db0c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ib373f97ac26a2a3388748574bfa58ea40cb18e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:39:39 +00:00
Oriol Prieto Gascó
7e7df0d9b5 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 95d32d678c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Idae7664b658f8057b30b9bcc50379d0cb11845fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:38:06 +00:00
Oriol Prieto Gascó
9302caf862 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Iad8417e638ea030a77e8c011c3c37074e4587597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:32 +00:00
Oriol Prieto Gascó
95d32d678c Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
f53df5fed1 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 930ccdecef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I7731eed119f366ec0bb31eb74e75f83cdd8a0a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:13 +00:00
Oriol Prieto Gascó
50911db0c3 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 10e5657a39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ia608719d3aa47159c80dd303bcc11360c000ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:02:01 +00:00
Oriol Prieto Gascó
0dfc94f668 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:45:17 +00:00
Oriol Prieto Gascó
930ccdecef Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Ic6317a7cc2f0355a2c94ffddd200b7d489d54d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:44:34 +00:00
Oriol Prieto Gascó
10e5657a39 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:43:23 +00:00
Oriol Prieto Gascó
d6166e42a0 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev 2022-06-22 17:18:45 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app 
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
 2022-06-22 07:51:47 +08:00
TreeHugger Robot
95726e0bad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 197a73362f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32dc5bdae2382f25cede86570c65f634f99b454d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:02:46 +00:00
TreeHugger Robot
089393495d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: ec1cd45fbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfe6a64a92dce35959737ce1d4ee3a750a2c4c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:00:48 +00:00
TreeHugger Robot
197a73362f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 18:31:49 +00:00
TreeHugger Robot
47b148943f Merge changes from topic "tc_change_22062106_3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e0f4db7fa9
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-21 18:31:49 +00:00
TreeHugger Robot
ec1cd45fbb Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-21 18:31:49 +00:00
TreeHugger Robot
423cfe2296 Merge changes from topic "tc_change_22062106_3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aec918fd54
  Import translations. DO NOT MERGE ANYWHERE
 2022-06-21 18:31:49 +00:00
TreeHugger Robot
2fbe16426f Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78 am: c141388b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18911434

Change-Id: I6e0c72ec59e81b3116f33b74d87823e8b26a7394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:26:25 +00:00
TreeHugger Robot
0aaeabdfc0 Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725 am: 3997ccc2ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990

Change-Id: I7d9d027fa54ba90b7a5c4a290a168de01496e063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:26:16 +00:00
TreeHugger Robot
6a4236a3d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: 16a6989a3e -s ours am: 16dfffd6e3 -s ours am: 43b2ddba8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8115942890f809318aa86249479b9db6cc77ed5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:24:46 +00:00
Bill Yi
3991fb4e25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: 8c356181d3 -s ours am: bbce161bdf -s ours am: 9d91f503e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8444adf36ec35e0b8a73e56ff8d57cb2350ec713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:24:43 +00:00
Bill Yi
90db2965a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: ba3e9a0be7 -s ours am: 22f8ed5745 -s ours am: 89ee789df2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2090f6d13cb9c152c391a2f8893f6b5808fd71a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:24:32 +00:00
TreeHugger Robot
129be30a03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: c00d5a7f5d -s ours am: 81ffe66488 -s ours am: 96b9dcede4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If45d41532b9faf8e7afe591f2ef35bb689a8461d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:21:21 +00:00
Bill Yi
0f8f51d600 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: d753deda12 -s ours am: 1c73653383 -s ours am: 35f9a4317c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia35464b91748ebb5ba4a990aa296b557a2cbe5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:21:14 +00:00
Bill Yi
3286cc28e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: 3f823f660a -s ours am: bec60237b0 -s ours am: 9e12dd6117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I330d6e156ae2b03aba926aadf53b8fa90fa57119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:21:07 +00:00
TreeHugger Robot
6cc8e0f84f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: 16a6989a3e -s ours am: 9ea3a54355 -s ours am: cc486e05da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c5836782c468c81e872adb9e64096ada7f43864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:18:54 +00:00
Bill Yi
119231e103 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: 8c356181d3 -s ours am: 3a2fbdc7da -s ours am: 5150e74a85 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d28d5c362b9de0418807199b18b0c2ebde466e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:18:50 +00:00
Bill Yi
d8c646a3c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: ba3e9a0be7 -s ours am: 414f01583d -s ours am: abda02e185 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I679db3e2adf53a84f9852735a941b2bb1876bb77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:18:40 +00:00
TreeHugger Robot
c141388b7a Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18911434

Change-Id: I21514aba3524eeff34fccf3e31953f184f36fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:06:53 +00:00
TreeHugger Robot
3997ccc2ee Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990

Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:06:42 +00:00
TreeHugger Robot
43b2ddba8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: 16a6989a3e -s ours am: 16dfffd6e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1289f99c7886f5734816309fe468dc87fc1dda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:05:48 +00:00
Bill Yi
9d91f503e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: 8c356181d3 -s ours am: bbce161bdf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8da65621500e49aefddac4acb71ba6ef83d36284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:05:40 +00:00
Bill Yi
89ee789df2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: ba3e9a0be7 -s ours am: 22f8ed5745 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10214c9c17a5ef9d5ba3cdf4a18b52f9ea434d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:05:32 +00:00
TreeHugger Robot
ea9b715e78 Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev 2022-06-21 17:05:16 +00:00
TreeHugger Robot
2d0e1dc725 Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev 2022-06-21 17:04:33 +00:00
TreeHugger Robot
96b9dcede4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a -s ours am: c00d5a7f5d -s ours am: 81ffe66488 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I664c8bb788fb355e33c641d73a554317d50dc789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:58:55 +00:00
Bill Yi
35f9a4317c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898 -s ours am: d753deda12 -s ours am: 1c73653383 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4cbdd3c0de493173f80fb3ccc537f2583e021db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:58:46 +00:00
Bill Yi
9e12dd6117 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891 -s ours am: 3f823f660a -s ours am: bec60237b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf47e148983153c94d0a6cb1524581bc0d7c7cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:58:40 +00:00