PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,176 Commits 1 Branch 0 Tags
f635191bf3d9a1f63af321f13cb92c5c138b51a7
Commit Graph

109176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a93e78f781 Merge "Fix array-related errorprone warnings" 2022-08-17 18:37:46 +00:00
TreeHugger Robot
e671474e54 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 am: 7f32697692 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: Ib1cde7a72e43ef82db43b15e2d029857b4f0e18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:29 +00:00
TreeHugger Robot
a1e365891f [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours am: 84935ceab8 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I9dc41d0c0081fc1a6f5fc7f9e8681bb8ce2dc555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:04 +00:00
Tsung-Mao Fang
39f5e29a4e [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours am: fa5900b6ba -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I201879780c8ae74b917f0d0b9f6d1f8efca3dc0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:12:01 +00:00
Tsung-Mao Fang
4e53971f19 [automerger skipped] Wi-Fi panel doesn't need to check permission am: 5e785a2d99 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 d2c372450c is already in history

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

Change-Id: I22b02fef7d8f63615f203fa3634d47b2d369cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:11:47 +00:00
Tsung-Mao Fang
56c191d288 Wi-Fi panel doesn't need to check permission am: 5e785a2d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19634561

Change-Id: I78c410c92c0d7f8d828fab92db97303814a09ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 18:03:31 +00:00
TreeHugger Robot
7f32697692 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19590400

Change-Id: I65697bb252fe44e18cbca6ca1a7b74e8d66f18ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:32 +00:00
TreeHugger Robot
84935ceab8 [automerger skipped] Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev am: 75ee88eaa0 -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: Ie074b5d8865a251480f7e8d116542296e5253be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:13 +00:00
Tsung-Mao Fang
fa5900b6ba [automerger skipped] Wi-Fi panel doesn't need to check permission am: d2c372450c -s ours 
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 a71907e873 is already in history

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

Change-Id: I2fe3c73254c35c778191cf8899fccf48dcab7a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:47:08 +00:00
TreeHugger Robot
75ee88eaa0 Merge "Wi-Fi panel doesn't need to check permission" into tm-d1-dev 2022-08-17 17:16:52 +00:00
Weng Su
dc4ad09291 Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID 
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
 2022-08-17 07:07:17 +00:00
Robert Luo
c6d8ef82c4 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e131 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096

Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 04:58:02 +00:00
Robert Luo
63aca8e131 Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev 2022-08-17 04:28:08 +00:00
Jason Hsu
cd76ba8821 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev am: f21593c870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19569012

Change-Id: Iaa33b5b62f4940559c8fc630022456971f8fae11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 03:32:25 +00:00
Jason Hsu
f21593c870 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev 2022-08-17 02:43:47 +00:00
Tsung-Mao Fang
5e785a2d99 Wi-Fi panel doesn't need to check permission 
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
 2022-08-17 02:43:03 +00:00
Xin Li
0257fe3a5a [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7 -s ours am: 070c045837 -s ours am: 60b4260064 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: I1d444527673496c6a7fa5c971d817224328f1262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 01:21:39 +00:00
Xin Li
57ee5a5d99 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours am: 98c2ff5b3b -s ours am: 98393cab55 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: Idb998e009c465ab25350aea8a06714aef4ec83bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 01:21:35 +00:00
Xin Li
60b4260064 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7 -s ours am: 070c045837 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: I6dba60d125dbcd7b9354ccca5c72ef2c3dd42228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:58:22 +00:00
Xin Li
98393cab55 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours am: 98c2ff5b3b -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: I84b03571dd3a54e31c2c0af16c752254b4a5a3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:58:18 +00:00
Xin Li
070c045837 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c27f705eb7 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: Ie78dba9efd64ed87c36577b4f705fb6eb102ebab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:30 +00:00
Xin Li
98c2ff5b3b [automerger skipped] DO NOT MERGE - Merge Android 13 am: 48b65ca561 -s ours 
am skip reason: Merged-In Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4 with SHA-1 2e005f4cec is already in history

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

Change-Id: I93435f94befbf09d289979ac46e97ca0cf83d9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:27 +00:00
Diya Bera
347cd8bca3 Removed redundant face unlock option. 
Test: To be updated.
Fixes: 234309000
Change-Id: I5fcf682860de9b76d61878df04182bc382292f56
 2022-08-16 22:48:25 +00:00
Chloris Kuo
41e650c223 Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev am: 4d4bf61c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19641993

Change-Id: I11f45faad393404ba00d464d7caea674360428ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 20:26:21 +00:00
Chloris Kuo
4d4bf61c4c Merge "Fix settings crash when enhanced notification shown in search results" into tm-qpr-dev 2022-08-16 20:05:46 +00:00
Julia Reynolds
80e1ca7c54 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev am: dbaa419226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19624197

Change-Id: Iffe89254913fab91b02e3e5db18939912204de40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 19:55:23 +00:00
Xin Li
c27f705eb7 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:11:14 +00:00
Chloris Kuo
359929732d Fix settings crash when enhanced notification shown in search results 
init NotificationBackend in constructor and set isSliceable to false in
search result since the NAS enabling logic is required and is in the
parent fragment ConfigureNotificationSettings.

Bug: 237251075
Test: test manually on device
Change-Id: I9082d6eda27784cf378a0d06304b5fc1e2ae6d7f
(cherry picked from commit 26ce9a98f0)
 2022-08-16 17:08:17 +00:00
Julia Reynolds
dbaa419226 Merge "Update Bridged app link when NLS access changes" into tm-qpr-dev 2022-08-16 17:07:18 +00:00
Xin Li
48b65ca561 DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
 2022-08-15 22:04:37 -07:00
TreeHugger Robot
43415ece54 Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev am: ea3f9f337e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622

Change-Id: Ica9d66e5ddc85ea049fe170a9b9e245e07c72542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 04:37:08 +00:00
Hugh Chen
2358afae79 RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature am: 1311019b9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19447622

Change-Id: I3dd165a645a1bb63613d541453e32d7c943df776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 04:37:06 +00:00
Treehugger Robot
cf01938b05 Merge "Remove luyota from OWNERS." am: dcd3081158 am: d3a358910b am: c50439e229 am: b7d0aaca3c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: I4793c21cdd3ed46c0ce7e5680b41e4470d14ac27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 04:28:01 +00:00
TreeHugger Robot
ea3f9f337e Merge "RESTRICT AUTOMERGE Let advanced VPN profile visible immediately before the user consent to use VPN feature" into tm-qpr-dev 2022-08-16 04:03:12 +00:00
Tsung-Mao Fang
d2c372450c Wi-Fi panel doesn't need to check permission 
Prior to this cl, we use #getPackagesForUid()
to get a list of calling package names and
pick up 1st package name in the list as target
calling package. And then go to check the
Wi-Fi permission.

This implementation is ok for most apps without
sharing system uid. However, this may not work
if the package is set with sharing system ui.
In this case, we get a list of packages
and we don't know which one is caller. So, if we
decide to choose the 1st package as our
calling package, then it could fail to pass
permission check since that package could be not
a correct calling package.

In this cl, we skip permission check for those
packages running with system uid. So, it can resolve
Wi-Fi Panel problem since Wi-Fi panel runs
on settings process(with system uid).

Test: 1. adb shell am start -a android.settings.panel.action.WIFI
2. Verify on assistant app and system ui launcher and search app.
Bug: 240531998

Change-Id: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
 2022-08-16 03:59:56 +00:00
Treehugger Robot
b7d0aaca3c Merge "Remove luyota from OWNERS." am: dcd3081158 am: d3a358910b am: c50439e229 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: Ie2f8b6160d32786a9067d1211c5bfa199d1281d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 03:23:35 +00:00
Treehugger Robot
c50439e229 Merge "Remove luyota from OWNERS." am: dcd3081158 am: d3a358910b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: I4e704eb49210afd13f7c00841ad6b242988a3e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:57:05 +00:00
Treehugger Robot
d3a358910b Merge "Remove luyota from OWNERS." am: dcd3081158 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2184476

Change-Id: Ibc32c7ab34a3006acca4f0edbb38645d2c6ecf9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 02:31:16 +00:00
Treehugger Robot
dcd3081158 Merge "Remove luyota from OWNERS." 2022-08-16 01:53:34 +00:00
Cole Faust
a21ac03acb Fix array-related errorprone warnings 
The ArrayEquals, ArrayHashCode, ArrayToString, and
ArraysAsListPrimitiveArray errorprone findings were
demoted from errors to warnings. Fix existing
occurrences of them so they can be made errors again.

Bug: 242630963
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ida6513002f8fd845a385924be290b720f06c4748
 2022-08-15 18:52:37 -07:00
Julia Reynolds
2a61b3656b Update Bridged app link when NLS access changes 
Test: BridgedAppsLinkPreferenceControllerTest
Test: manual; turn an NLS on/off, verify correct disabled state for fields
Fixes: 240461761
Change-Id: Ib5a5365f7477c2a8d620ced2af96ace364b292e2
 2022-08-15 17:50:49 +00:00
Weng Su
911573f2e1 [RESTRICT AUTOMERGE] Show default data SIM in Wi-Fi details when dual SIMs have the same carrier ID 
- Because the wifiConfiguration is only save the carrier ID for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- Show default data SIM in Wi-Fi details settings, when dual SIMs have the same carrier ID

Bug: 233765468
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test

Change-Id: I350fe637f506134770ccf316e47c0e225661bb6a
Merged-In: I350fe637f506134770ccf316e47c0e225661bb6a
(cherry picked from commit 2732be59e5)
 2022-08-15 13:31:52 +00:00
Weng Su
028c8f3dbc Show one SIM only for EAP-SIM when dual SIMs have the same carrier ID 
- Because the wifiConfiguration save the carrier ID only for EAP-SIM authentication

- If multiple SIMs have the same carrier ID, the Wi-Fi framework will use the default data SIM for EAP-SIM authentication

- To avoid user confusion, show one SIM only when dual SIMs have the same carrier ID

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

Change-Id: I56f956d20053d314f082ba185d661d8e0a0ef3cb
Merged-In: I56f956d20053d314f082ba185d661d8e0a0ef3cb
 2022-08-15 13:25:47 +00:00
TreeHugger Robot
f38346a569 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: ec740c30d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec6bc26eda8a7a2542503f351264dfb9eda0720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-14 21:18:13 +00:00
Bill Yi
94e8fafbf2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2337f90b7e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9f2f05c38f72f6ad035f3b2102b065ac4e9bb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-14 21:17:47 +00:00
TreeHugger Robot
ec740c30d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-14 20:53:24 +00:00
Automerger Merge Worker
1a16cd5b46 Merge changes from topic "am-34bf4ac7f49d41048fc87ed16f762c0a" into tm-d1-dev-plus-aosp am: a5c64e1c4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19606358

Change-Id: If9e522e1a986e16dd573b8211c243b98df7b0cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 05:18:12 +00:00
TreeHugger Robot
dc2cfedb43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours am: ff652e848d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ef5c97ffe12a5707b1f0c7a70207084e8fb1376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 05:17:59 +00:00
Automerger Merge Worker
70b822f133 Merge changes from topic "am-ae7375ba66c94a8f9d459c889d6bf72a" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: cedd9510e1 -s ours am: 1215a5dff3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d4bf7b223 -s ours am: 9b8d62847e -s ours am: 0e2272c6f6 -s ours am: 6e1b3b15d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d14a19eee -s ours am: c64165dc4a -s ours am: 89ae91f7cd -s ours am: 76812fbeb1 -s ours
 2022-08-13 05:15:16 +00:00
TreeHugger Robot
5637ebfb5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 957768ce00 -s ours am: e91b230bac -s ours am: fb1a655d43 -s ours am: 3242d750df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I467c80b142a6a6253da522e27ea857bbc8a52c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-13 05:14:08 +00:00