PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,443 Commits 1 Branch 0 Tags
d951e2a0481af3e88fca67a35e0a9322d045459c
Commit Graph

121443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
d951e2a048 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I083eb0ad520c24c4bcf7627db7881d1872cdac5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:48:53 +00:00
Wilson Wu
a19f80aab8 Merge "Fix wrong user in personal profile" into udc-dev am: ce7ad1f8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22307474

Change-Id: Ib735a7e0015c217ff1c9067c5bab3cdd1fe8cb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:33:22 +00:00
Treehugger Robot
486691ad26 Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I94301fd7e273f781aa5029128d960f8b9fb1c2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 10:03:11 +00:00
Wilson Wu
ce7ad1f8a0 Merge "Fix wrong user in personal profile" into udc-dev 2023-03-31 09:56:56 +00:00
Treehugger Robot
06bca85c6a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I77867e2c59c5745cf8b705072e5b0b35c455f399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:34:23 +00:00
Treehugger Robot
7871a9e9bd Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I998baee786f01ee74743a02d369f8159caa89ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 09:06:29 +00:00
Treehugger Robot
60d9be5a0a Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" 2023-03-31 08:20:36 +00:00
Hieu Dang
8689460fa4 Merge "Check availability on start for TetherSettings" into udc-dev am: 968dfc9c2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I0d6344bd31759e32faaa98a274f7b5bf618494f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 07:05:55 +00:00
Hieu Dang
968dfc9c2e Merge "Check availability on start for TetherSettings" into udc-dev 2023-03-31 06:30:53 +00:00
Hieu Dang
12fc50ca3b Check availability on start for TetherSettings 
mUnavailable variable is only assigned when creating the activity. This make the app crash when we disable tethering and then resume + toggle on the Bluetooth Tethering. This cl remove the variable and directly check whenever the app start.

Bug: 270285631
Test: manual
Change-Id: I0dff1d11cbcc06816a69985f96eee828bb83e87c
 2023-03-31 05:30:44 +00:00
Hao Dong
5b159df4f0 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: Ic64e0e8fe81d3e881b356e60d360ff9729876faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:33 +00:00
Hao Dong
9ff72e4205 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev 2023-03-31 04:44:16 +00:00
Patty Huang
b79d64ee90 Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio" 
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
 2023-03-31 12:43:14 +08:00
TreeHugger Robot
d35e1c4426 [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours am: f8717edcbd -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: I8214b8ebbd85770f9f6b0c2fe4e4f14ccf0c5423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:28:15 +00:00
Hao Dong
b0ff672a7e Post-enroll settings screen shows class 3 strings 
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
 2023-03-31 03:05:57 +00:00
TreeHugger Robot
f8717edcbd [automerger skipped] Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a am: 3771564adc -s ours 
am skip reason: Merged-In I63ba7f3b10fc812dd1498f17826a15e822879613 with SHA-1 5e1c4d15a9 is already in history

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

Change-Id: Ic83c4f5c399c330f0c0d080d0e798bd7335bc7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:58:30 +00:00
TreeHugger Robot
3771564adc Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev am: 0362083f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21367719

Change-Id: I54ad21af66956d5711a72f587d9af4c8389a185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:23:13 +00:00
TreeHugger Robot
15343f6585 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f am: 17e504f6a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I17c98e3c717fe86f31e19be40f660b73d6a5cce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:56:10 +00:00
TreeHugger Robot
0362083f3a Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev 2023-03-31 00:20:15 +00:00
Julia Reynolds
765f392ccc [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours am: fc865d217d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I24d48fe50abd94b3dfb6e1df3a9a6d4a9be6a1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:14:13 +00:00
Automerger Merge Worker
9595f67163 Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev am: d7a04c0467 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I0f3e6f4dbb800506857a2b887eb11fefcfffe20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:15:05 +00:00
Julia Reynolds
6586a5b108 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours am: fd60b8f6e2 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ibf735b4dd8915d542f062c3d3419f85ca38e2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:15:02 +00:00
TreeHugger Robot
acbbbf6a33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours am: 7c6a59f183 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ade333d9592594c86fc244eb3fcf7309bcfbe6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:09:17 +00:00
Bill Yi
9ce48d9526 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours am: 9f71ec4375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2feb1ef756f0bee037eda641bf8e6eac52839160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:09:14 +00:00
TreeHugger Robot
d1eff9d22e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99ca19c6875727956eae08093c323f6201f300ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:09:01 +00:00
Bill Yi
21639e3e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21b6e933dba55a92dc44c15e3e49fbe041855ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:08:46 +00:00
TreeHugger Robot
17e504f6a8 Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:39:38 +00:00
TreeHugger Robot
f02d69dd4f Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478

Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:04:20 +00:00
TreeHugger Robot
76932b5ee4 Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3 am: 64aa2889d1 am: 5d0b8031fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468

Change-Id: I66a74e160ceae1b9a1df596584cf5454c7168605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:42:04 +00:00
TreeHugger Robot
8838d8639d Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6 am: d82f2eae5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: Iebb07c483f4fb8af1bb278095136559c5dfa25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:51 +00:00
TreeHugger Robot
b1f5565ee9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432 -s ours am: d7b40a08fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d9e42ed34c1ea50c8b995e323c9c527cd04ef16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:41 +00:00
Yanting Yang
22b870bd7d Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650

Change-Id: Iaeea61f5f54a2ab5a2bca25a6520d00bbe726bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:33 +00:00
TreeHugger Robot
b33294a11d Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I32587c2a97c0487da46aac1b96d6bdc689db1322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:12 +00:00
TreeHugger Robot
c321d9f1ea Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: I6a59a7c1ea69576296c84759522965a3dda26e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:23 +00:00
TreeHugger Robot
a18d8913c7 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: I53382574cf5b7196dad573c91f70f791efcdc026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:12 +00:00
TreeHugger Robot
9a0c0d7a82 Merge "Remove unused listener" into udc-dev am: a99c64dfde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: Iea5199833d7ad7ae89c743371e420b70aa295ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:01 +00:00
Julia Reynolds
fc865d217d [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours am: 9cbd3bdb54 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I85c1bcef79fdc660b8302e7e3baae730ff89d63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:38:21 +00:00
TreeHugger Robot
5bde972e4e Merge "Restrict DataUsageList for guest user" into tm-qpr-dev 2023-03-30 19:08:44 +00:00
TreeHugger Robot
bd81231f46 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I40a13c28ce829406bd361c1d7fbcd23f288a46ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:00:03 +00:00
Bill Yi
093609c5d9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb4554d64f6344c701c109c3cb62d598891914c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:59:53 +00:00
Julia Reynolds
9cbd3bdb54 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours am: bee2aa0c8b -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I0e68d9ee05a4b7fa0a5c38d1ac5138ae4272b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:57:52 +00:00
TreeHugger Robot
f7050b25ee Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I234c37cf039b6ea2283ecb3275aa783a4213d205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:53 +00:00
Bill Yi
232d836205 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff384be9146717a2d09643aede4e40fc550f3f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:48 +00:00
Julia Reynolds
bee2aa0c8b [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: 2a66721ccf -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I963414b8f0ab062e653ef5d4840d0c048f984144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:42 +00:00
Automerger Merge Worker
d7a04c0467 Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours" into udc-dev 2023-03-30 18:09:08 +00:00
Julia Reynolds
fd60b8f6e2 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours am: f445bb3b32 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie5eb9b7ca3cc8e0cef4c089d1921f1b172d2a568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:07:36 +00:00
TreeHugger Robot
7c6a59f183 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e -s ours am: 1cd917c2e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bb2163ceb952297b85e727b263fea044a3df8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:07:00 +00:00
Bill Yi
9f71ec4375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125 -s ours am: d87981f9a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica20e5f531ff51bd05a356c0ea985a37ce6157d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:56 +00:00
TreeHugger Robot
ce7f901993 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I346438976fefed962e0fff4565c738a594de0ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:49 +00:00
Bill Yi
f75cf95c2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4371f0ce39c336df758cf2477fb601f717bc100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:06:29 +00:00