PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,784 Commits 1 Branch 0 Tags
79eeb708435ac5e1008375c84d032039a38ad9cc
Commit Graph

108784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2800a2b1ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours am: 75bbbd7e94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c87c1a526f94fb0cc30996143a6799cf02c10f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:35 +00:00
Bill Yi
4bb22b64c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours am: 1e80eafe18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I278fa56bde679385ee6808b93f960ffe817c380b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:27 +00:00
Bill Yi
bf70c2e9e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours am: 8802d04401 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35c4c58e704afb40f939015b10d1d7f4bcd72357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:04:20 +00:00
Bill Yi
f2b015078d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: 09b0e3ecd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f1dede35bec9c749087aa250d1c014e797f637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:00:44 +00:00
Bill Yi
f0fda8ed36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 6f2d360a38 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95e171c52ec24612e9ea1ec8f512d7fc62c9eb4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:00:29 +00:00
TreeHugger Robot
512c7de992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: b182c27349 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc1f094fc36d0e6f5e1bfcca1eaa37d4e44dcea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:59:09 +00:00
Bill Yi
228a4e3c40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: 75ad2310e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c14a5bb425edfc496f47144665b5bd173008ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:58:59 +00:00
TreeHugger Robot
3dc5c2ab32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours am: bdceb524a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2056ef3d6d5abde33c6532a0cd8a82ac5bb2fba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:56:56 +00:00
Bill Yi
44bc157e7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours am: 5dae5623ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib986109ee5b23a57c0475f1b20025d2335c1f975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:56:52 +00:00
Bill Yi
e86b42302d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -s ours am: c4ff0995f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I313619c0ebb036c24feae5ec4a27c06958932540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:54:10 +00:00
SongFerngWang
4a48dc5e96 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Ib1c261e07e1878b60bd067694e19eea92bb11866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:47 +00:00
Bill Yi
75bbbd7e94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1563e164994b59d9bb16972a6ec1f55d9237a20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:45:05 +00:00
Bill Yi
1e80eafe18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60a66ff7f0ce28070f827c380871914b0265c9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:44:59 +00:00
Bill Yi
8802d04401 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a725066560165e538b616b8078ba51e5565bdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:44:50 +00:00
Bill Yi
09b0e3ecd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08ee4c34afc8f86ddaf2e5c4e01015387210c655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:56 +00:00
Bill Yi
6f2d360a38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45a63dc4fecdc183e55803bf7989e10d92fe5b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:41:42 +00:00
TreeHugger Robot
b182c27349 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I098ee079462a0f7cd85aa22516bb0b80b85cb0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:38:30 +00:00
Bill Yi
75ad2310e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46a8c6924ee60efb5dcb7c895af54c5d317a57d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:38:21 +00:00
TreeHugger Robot
9e388f0f07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours am: ed552ecb6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6add0766b7198cd640e499eb8004d28657849ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:37:18 +00:00
Bill Yi
7eb6dd635b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours am: 0dbf58c5c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05f68b58538a7fe042cb4451d54740e2a3346651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:37:03 +00:00
TreeHugger Robot
bdceb524a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8420909a0317ffe1fc68fe31dc5c54bdcda41f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:47 +00:00
Bill Yi
5dae5623ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic18cefcfec061a2c91cd3bd943c2d6f714afbdc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:45 +00:00
Bill Yi
43bed90ebd [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4594325b6809e67239f58366a67f4487e963b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:21 +00:00
Bill Yi
588a5a1577 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d2d69938247a8c9e5b6eaf778631f172d0ecc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:34:05 +00:00
Bill Yi
c4ff0995f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cab8532874 -s ours am: d656305b74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d06476ca757e386d8e5c127d7454b0455048e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:33:15 +00:00
TreeHugger Robot
ed552ecb6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1db9d46a3fdd80511cbace631c180b7d8aac0767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:28:11 +00:00
Bill Yi
0dbf58c5c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dc614515ce369e668fea2724c29cfa2a834483c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 20:27:56 +00:00
Bill Yi
2fcb15c9c1 Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" 2022-07-08 20:14:12 +00:00
SongFerngWang
7a5c00b31a [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 am: 2f3cc48f25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Iaafa849519b2d55d51f867276189e32ddf901d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:58:12 +00:00
SongFerngWang
5ed0fddd7b [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25 am: c559d2fc15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Id8bee70ff8e6315d4238191ef69616f738e1d84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:57:32 +00:00
SongFerngWang
2f3cc48f25 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Iae6e21906eae92065690270c8d03b4d62d17f780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:33:49 +00:00
SongFerngWang
c559d2fc15 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: Id45fdf5085bcbf49084accf95ffe46098668b74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:25:25 +00:00
SongFerngWang
289796e9a3 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I6b76e6a4efe1dcd72c18e503dd3af853c8536276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:08:48 +00:00
SongFerngWang
9712359f25 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I7c0faaee0483eab1f36f6ba5646366f2ab523318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 19:07:19 +00:00
Bill Yi
c73b07dc76 Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE 
Merged-In: I5ea05490d13515baaeda9ea7b6c153c8c2d0a54e
Merged-In: I7a2a0e8da3ae59219e9984e8437ce0b1e007bce2
Change-Id: I677947b60b051c89293ca58359cb56b8cbc63ec8
 2022-07-07 15:33:30 -07:00
Weng Su
be23c28ff2 Prevent leaking Wi-Fi dialog on lock screen 
- The Wi-Fi dialog is designed to be displayed on the system UI

- Dismiss Wi-Fi dialog to prevent leaking user data on lock screen

Bug: 231583603
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Ie67ff1138ffeddd3e358331d8cef61e0629173e2
 2022-07-08 05:43:10 +08:00
Xingbin Feng
3cbff800a3 Fix incorrect storage calculation when SD card is inserted 
The displayed internal storage is incorrect when an SD card
is inserted into the device.

Bug: 209962845
Test: Insert an SD card with some content. The System
storage calculation should remain unchanged.

Change-Id: I0a338bc306c0ade68747356714cd291e209a5069
 2022-07-07 14:42:57 +02:00
SongFerngWang
286dce6b6e [MEP] Hide the preferred SIM dialog when the user has replaced the SIM 
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
 2022-07-07 08:39:03 +00:00
Amy Hsu
7087e5c457 [RRS] Activate investigation of screen_resolution in settingsstats 
Define a setting string for putting data for suez/settingstats.

Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
Merged-In: Ib4622490b0f63139b47f242ebcae916edf291cea
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
 2022-07-07 08:15:47 +00:00
TreeHugger Robot
7bdfb34b7b Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028

Change-Id: I37125c165dbb9d48d672666512faec8248bce5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 19:49:52 +00:00
TreeHugger Robot
9447ec6d81 Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev 2022-07-06 19:32:12 +00:00
Aleksandar Kiridžić
1a508148ad Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev am: 7914c77660 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19138106

Change-Id: I3bcdd2d794f7a3f78e24db4e3423583f00b7c297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 18:20:23 +00:00
Aleksandar Kiridžić
7914c77660 Merge "speech: Add on-device speech recognition settings entry" into tm-qpr-dev 2022-07-06 18:01:48 +00:00
Bill Yi
e36d62fb10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours am: b457d2c596 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9b0b2b3260b3123318e93cc3f9115ff5cedd1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:53:43 +00:00
Bill Yi
25558a8971 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours am: 88f8dca7ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1c5eec195acbb01aea5bc921036a3cd5a70ace2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:53:36 +00:00
Bill Yi
d261d5918e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours am: aad1e36cb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib67eb61d0d3c711b47d6e7f934fef97ef5bd205a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:53:28 +00:00
Bill Yi
c7f035f00e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 23a80ba165 -s ours am: f5ff147eca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id462340fd3bb7d9c2585e47dcb55c2cce50f72a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:52:14 +00:00
Bill Yi
ff973848d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: 3296352cb0 -s ours am: 692468d5ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56861a2cf0a5e41ec251ee1f84726858db9b22cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:52:07 +00:00
Bill Yi
f49d2cac6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: f6c853f21e -s ours am: e95e7cd6ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If828424828f25b71340e2b0e1fae336d642463e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:51:59 +00:00
Bill Yi
b457d2c596 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I308ba40d351c8a28fa297ad886a71ccdc99f8af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:22:07 +00:00