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

103814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
eb4acf8435 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev 2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f Fix a11y label for LE Audio Battery 
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.

After fix, "Left" & "100% battery" are grouped together.

Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
 2022-05-04 14:17:26 +08:00
TreeHugger Robot
928e18a669 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: c158bb54eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I9e12288335646d6b2a64ab60ebd5f13b713dbdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 06:00:25 +00:00
Automerger Merge Worker
36f9af3363 Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp am: 74d860ddfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Iff1fa05cc9e5641d12d97b601b67eb3f099597fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:18:08 +00:00
TreeHugger Robot
b29c95c3eb Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f am: a949b54610 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ic3285957d6e3921a09a5719cbb997af9af0fbe98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:17:58 +00:00
PETER LIANG
7d3e61f7c6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 am: 867c92b0e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Idca47d174e48266a6687166d153c85b169574aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:17:52 +00:00
Stanley Wang
6c36b93045 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 am: e5247fa06a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: If465b4d941f1640e8679495a5b124221a5685c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:17:45 +00:00
Stanley Wang
bb451d4723 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167 am: 2559f546b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: Ice32df7c0307c9f77faeae190eda4ac4d535917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:17:32 +00:00
TreeHugger Robot
c158bb54eb Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I1a2ddc08bb84dee2617aefcb96a6a16db335f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:17:17 +00:00
Neil Fuller
6187efa066 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719 am: 4c44d26387 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Ica49004e2863bf98532a79214cb60b82544e8ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 05:06:18 +00:00
Automerger Merge Worker
74d860ddfb Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp 2022-05-04 04:51:52 +00:00
PETER LIANG
00bf715c6d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ib5eef86c2ccf28ddcf48361692a24ce165c67e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:49 +00:00
TreeHugger Robot
a949b54610 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ifddf447db14dcafdaed421728bc6fd12b4e0ceab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:46 +00:00
PETER LIANG
867c92b0e9 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I09bcf12fc13e6936aa6b035650ccf2509a3d6da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:40 +00:00
TreeHugger Robot
6c10876f9b Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I4c6e6a4ceb5cb63adaf42f2a6cb73918a2698ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:38 +00:00
PETER LIANG
d4fef456b0 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ifd8e6d57e3474236f47a491ca331866f53532cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:33 +00:00
Stanley Wang
e5247fa06a Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: If19f76d5569105a23f9839876853e077b89fc166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:25 +00:00
TreeHugger Robot
680e9f0a0f Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I80db9f0bda301b4f1b8d9e309e970ca7ba05f93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:24 +00:00
Stanley Wang
2559f546b8 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I0e54eb4ca589c880b5c2b3bbd7bb5b6316bcb965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:15 +00:00
Stanley Wang
8f182af4dd Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: Id46b063dae31aea9bb1ce97f5b69f2cb6be95b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:51:14 +00:00
TreeHugger Robot
756ed72913 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev 2022-05-04 04:47:44 +00:00
Neil Fuller
4c44d26387 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: I6bdcf999c359ec062498476aedeb4c6ed7260922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:41:53 +00:00
PETER LIANG
e07c557ed6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I1b585ea03e075873011320f175a6cc48a18d7526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:15:09 +00:00
PETER LIANG
af3385fd0c Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ibcd1173ba5322d9ea9290e5ce232a62004d64ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:13:42 +00:00
PETER LIANG
3ba4d5876d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev 2022-05-04 04:10:05 +00:00
Stanley Wang
766828b6f5 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I22b633d74bca78f1e0816b8b41d96a39e6c71c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:07:10 +00:00
Stanley Wang
99c08f3167 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:05:45 +00:00
Neil Fuller
32a00bf719 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 04:04:52 +00:00
ykhung
3d1b6fd065 Add a mechanism to configure whether the summary should be set or not 
Add a mechanism to customize whether the summary information in the
battery entry should be set or not. We can consider is as the extension
for the ag/18062824.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I3c21148d288f29ce65378f59f9086dab90c14a7b
 2022-05-04 11:42:26 +08:00
Stanley Wang
32fa5502ca Merge "Update the title of Model page" into tm-dev 2022-05-04 03:15:45 +00:00
Automerger Merge Worker
c0016a8199 Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp am: 506b83e90e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I682cb35ddf1d301490ba3b582decd536ea1dfb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:07:46 +00:00
Chaohui Wang
7222612108 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 am: da6cba31ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I7d8f18cf99bdc67218b9c50feff07835e85efc10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:06:35 +00:00
TreeHugger Robot
70918a2ae2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -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: I0c0f9c962c3d006839d3df2c7beb0680d68342d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:04:16 +00:00
Bill Yi
9b5cdf865f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -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: I5f29e52332480c2d36ef2c1a0ba7d2362ba4ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:04:11 +00:00
TreeHugger Robot
9cec02505c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -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: Icee5b1aa0514bc1309b1e470304b24169bfa0864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:02:31 +00:00
Bill Yi
d7fb82b9e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -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: Iac803e62c241ff01cce212ac0068862eefa852ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:02:18 +00:00
Automerger Merge Worker
506b83e90e Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp 2022-05-04 02:55:38 +00:00
Chaohui Wang
785eeffb50 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I576fbaf5c1c1b9ce52663bc5cafbd7f3ef36d414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:55:28 +00:00
Chaohui Wang
c5a94b2043 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I7f2e8587a2c1c2749e1a806a4202368ed495466c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:55:27 +00:00
Chaohui Wang
da6cba31ce Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: Iacfd67d8ea9db028ade85808a23dcd3922ed8605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:55:19 +00:00
TreeHugger Robot
aceb22d536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -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: I733a059f3c768b428b30f37f3bd76970d68a4162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:39 +00:00
TreeHugger Robot
155855fb5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -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: I298a5731ee5ad9b70c2fa27f19cb95c9436f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:33 +00:00
Bill Yi
c9b4aede2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -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: I49f55737ab561348ff8cf07e7ee6bba4c4958b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:31 +00:00
Bill Yi
cd779d5f34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -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: Id32cfc9220f693e1f409e27b71371f68f65511fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:18 +00:00
TreeHugger Robot
011098d8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -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: I99354e81b48f43663eca100aecf5a6ffba349b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:52:06 +00:00
Bill Yi
1f3bfe46d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -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: I95fae25faaaa1ef0b40a6322adea8af4f1fd17b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:51:51 +00:00
TreeHugger Robot
2b07d43d13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -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: I17fd3c94ea532929b7a30e3b283921939e33e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:45:08 +00:00
Bill Yi
d78b644ba5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -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: I7239a06eacdd0bba6337a648fe8aa5a908a89cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:44:50 +00:00
TreeHugger Robot
982553d4f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -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: I1d7aea199fe2084c8f534e9c9a8a142f0984411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:43:11 +00:00
Bill Yi
3ae3da42e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -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: Icbc04b1dff3053ae4e7892773b1e7b98e7cfc6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:42:47 +00:00