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
TreeHugger Robot
eacedb46b2 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: c916acb354 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

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

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

Change-Id: Ia35c3a1ed116f73e2e361b6b955badd20009dc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:18:37 +00:00
TreeHugger Robot
03121e1ee0 Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: f70b302fa4 am: 9586e56f1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: Ic664ff2498db1dc858f45316f6fc2c4a0dc44a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:17:54 +00:00
TreeHugger Robot
5b17fe9709 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 am: 5db41eb95c am: cec1726eae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I05d064151b42362eb3accd26fcff7d6d4170e1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:17:48 +00:00
Bonian Chen
3adc2acf70 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: f861ceb41f am: 030f62f25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: Idc829e60734e53e7a8f93f68443fa9e960f7c258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:17:33 +00:00
TreeHugger Robot
9586e56f1e Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d am: f70b302fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

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

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

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

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

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

Change-Id: Ib2df72e8ef2b7cd4bc35b16f8da1d64efcc04906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:09:14 +00:00
Automerger Merge Worker
070221bb39 Merge "Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e" into tm-d1-dev-plus-aosp am: f95ffa849c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

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

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

Change-Id: Ia77e9f8730d2f11c48ed62287a584ae23bab336b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:08:43 +00:00
TreeHugger Robot
cf52a8ea7d Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev 2022-05-03 08:58:13 +00:00
TreeHugger Robot
15d1a490a4 Merge "Remove loading spinner from Premium SMS access" into tm-dev am: 611db9e8be am: 70e4a209c8 am: 4942694f50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903584

Change-Id: Ib4bf0b6e2f10428b9ab831c37d2e738752abd669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:57:54 +00:00
YK Hung
89fc432521 Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev am: 55fcb02aca am: fc95a8f973 am: 6ff7a106b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030883

Change-Id: If52afa9fb982f716c7b500525af874008d2d5da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:57:34 +00:00
Bill Yi
ac9a918825 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours am: f7c06375b1 -s ours am: 61ba40c852 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I336b65e817657758d81f616a052c1f275f3f57a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:56:54 +00:00
Amy Hsu
0797510276 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 am: d99149b0b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872

Change-Id: I2f17ed3429db499bc5868a569be7fd6a14292d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:54:38 +00:00
Prabal Singh
d1dc631f0e Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197 am: 158164e219 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

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

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

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

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

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

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

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

Change-Id: I12a786e071a6ef13e80c1eced80c2a4cdbc65497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:14:52 +00:00
Automerger Merge Worker
f95ffa849c Merge "Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e" into tm-d1-dev-plus-aosp 2022-05-03 08:14:51 +00:00
Edgar Wang
2063f2a646 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 am: 585552149e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

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

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

Change-Id: Ib0e765d83cde49c35d7f20897ac79e8a9eb717d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:14:41 +00:00
Hugh Chen
ec0c171735 Fix can't select the [USB Tethering] item in [Developer Options] 
- This CL is using 'USB_CONFIGURED' to check whether the USB enumeration
  is completed from the intent. If 'USB_CONFIGURED' is true then update
  the UI.

Bug: 229200265
Test: make -j65 RunSettingsRoboTests
Change-Id: Icab05e37ae3fcc9f1bf404a610fc97c368c453f5
 2022-05-03 08:00:58 +00:00
TreeHugger Robot
e99683f013 Merge "Fix the flashing list on Opening link page" into tm-dev 2022-05-03 07:59:17 +00:00
Bonian Chen
337cfe6fc0 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev 2022-05-03 07:54:30 +00:00
Betty Chang
b1fa93e7ef Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

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

Change-Id: I21dc53385d41f1bfc5db2e11535b11902434d3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:34:07 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor 
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
 2022-05-03 07:33:48 +00:00
Betty Chang
e076e599b5 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I87abeb4a2d67f78a1cc9313a0c82b5f3cd4e82f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:33:00 +00:00
Edgar Wang
585552149e Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I273f03d6a2221dd937f382b1cd8a2aec7fcaa0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:32:43 +00:00
Betty Chang
5dea2176a2 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev 2022-05-03 07:21:11 +00:00
Edgar Wang
37ad451324 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev 2022-05-03 07:14:24 +00:00
Weng Su
e37a553e94 Show restricted message in Wi-Fi hotspot settings 
- Remove Wi-Fi hotspot preferences in settings search if Wi-Fi hotspot is disallowed

- See the result screenshot in b/203168953#comment12

Bug: 203168953
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Id4416fd0659b596e4e6f31890a139198219f4552
 2022-05-03 13:58:54 +08:00
Bill Yi
03629d6488 [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: 44a2ff89cf -s ours am: 23be7b9db3 -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: Ia717cdb2dba4bcfd75391740ef9b13ec12aabab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:23:24 +00:00
Bill Yi
28d1ece33d [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: b47701d110 -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: I6600e158e8cbf8e0cd4b7d615c59b6fa2b151d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:22:59 +00:00
Bill Yi
85219c11e2 [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: 3ad5a7ee3f -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: I6b0aff76ddc7b90a94d3c471e84fc2372ea3df65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:22:50 +00:00
Bill Yi
32173d81cc [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: 75bc75a29f -s ours am: 179a379817 -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: I0f25de4e1e74f4876c7f6d37e7371ac67312d69b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:21:47 +00:00
changbetty
f31b5769d7 [LE] Launch the dialog for the user to broadcast or find broadcast 
- Launch the broadcast dialog from entry point in Media Volume Slice

    - Fix the broadcast dialog to follow the dialog style

    - Start broadcast and launch the MediaOutputBroadcastDialog from
      broadcast dialog

Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
 2022-05-03 03:16:08 +00:00
Bill Yi
23be7b9db3 [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: 44a2ff89cf -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: If7e2ae9d51d2f6db6b24b00c7ceeb592dbb423ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:25 +00:00
Bill Yi
b47701d110 [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 skip reason: subject contains skip directive

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

Change-Id: I7418afc8372393f6d9011f4ad36b7ca4b6cd5c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 02:23:11 +00:00