Milton Wu
04b600d0d8
[BiometricsV2] Refine ErrorDialogViewModelTest
...
Some FingerprintEnrollErrorDialogViewModel APIs related coroutine don't
be well test in FingerprintEnrollErrorDialogViewModelTest
Bug: 293044262
Test: atest -m FingerprintEnrollErrorDialogViewModelTest
Change-Id: Iab3897d37c904184c1f58ab617e74cd563b3aa43
2023-07-25 13:02:02 +00:00
Bill Lin
41e2f9c1c0
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2 am: f71d183d0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645
Change-Id: Ice5e79a72872009b5f1f90faf8bf9b02854c40d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 02:40:33 +00:00
Bill Lin
f71d183d0b
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev am: c8eb80bcc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24175645
Change-Id: If919e1da98abb430b7d6c79211139c6f2a1e4f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 01:57:48 +00:00
Cassie Wang
75842520d2
Add a config to show the Vpn options menu.
...
Bug: 290124499
Test: m -j32 Settings
Change-Id: I14d59b656e917f6fb7a495f14297c594a115c018
2023-07-25 10:31:45 +09:00
Bill Lin
c8eb80bcc2
Merge "Fix no vibration when enroll init stage after receive onEnrollmentHelp" into udc-qpr-dev
2023-07-25 01:30:28 +00:00
Automerger Merge Worker
78f3760d26
Merge changes from topic "am-f755b8c24ad94702890f1d42d43459e9" into udc-qpr-dev-plus-aosp am: aa25f927b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Id13d948f53e5ed006a92025b28167df586a8ae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:50:47 +00:00
Treehugger Robot
be03940ae6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours am: a439e611f9 -s ours am: 23b2daac94 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I4f5621fe2ddcc5210f4945abe8b88c9420c9604f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:50:32 +00:00
Treehugger Robot
392bab04a1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours am: fcea32c091 -s ours am: 52ffe43752 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Ib22fcf9b55dfa81b08125d8db28e0bfaa2e2cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:36 +00:00
Bill Yi
01a62cf373
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7 -s ours am: f59718d27d -s ours am: 5309e5726d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I88df26646807f3f96b68a58672da7f111bed78b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:26 +00:00
Bill Yi
1f46346431
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c -s ours am: 6f38faac18 -s ours am: 81829e623d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I353239b2706d5b911ec5f671e44ed38b1b69718a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 21:43:11 +00:00
Automerger Merge Worker
aa25f927b3
Merge changes from topic "am-f755b8c24ad94702890f1d42d43459e9" into udc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6ca439e611f947855826c77db67a88510b179a9a1c93b217da0f
2023-07-24 20:56:20 +00:00
Treehugger Robot
23b2daac94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours am: a439e611f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I55fb1a3666b69fd469866dc2aaa23af4ada6d628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:30 +00:00
Bill Yi
56f20a8956
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7 -s ours am: 7db67a8851 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I28cebef2eab44987bc2d2224137f5407a4d4139a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:28 +00:00
Bill Yi
35a9d7e192
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c -s ours am: 93b217da0f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I24aad12367aeaa688215c679c78ffef0660e03ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:54:04 +00:00
Treehugger Robot
52ffe43752
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours am: fcea32c091 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I424b430c656f5f0e5606d2983d6d14ac6de44d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:50:07 +00:00
Bill Yi
5309e5726d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7 -s ours am: f59718d27d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I73f116475fd5295e7c0c9438b0502c8051746fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:49:57 +00:00
Bill Yi
81829e623d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c -s ours am: 6f38faac18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I8ca6e698c0a408f58648dcbeda3ffdf479f7e685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:49:43 +00:00
Treehugger Robot
fcea32c091
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: If5ea1b183887a10024983c03994ed945de3ab5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:48 +00:00
Bill Yi
f59718d27d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: Ia68b58c9935fe4425f4aa06e6d37d401d0c8d7d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:33 +00:00
Bill Yi
6f38faac18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: I3d6bb56c0a4356d063a2a9db0bf6a6eb2ad15a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:31:30 +00:00
Treehugger Robot
a439e611f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1a073f4f6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I9d69d8978d412140ecf37fc0c96756ad12f95f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:12 +00:00
Bill Yi
7db67a8851
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47855826c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179437
Change-Id: I6998be11d631b1a584327e477f690ef8c52b2182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:30:07 +00:00
Bill Yi
93b217da0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b179a9a1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24179284
Change-Id: Ieaa0b92c521914293cd766388890f3b46eb574e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-24 20:29:48 +00:00
Treehugger Robot
1a073f4f6c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-24 19:18:34 +00:00
Bill Yi
0b179a9a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5cf9ebde62e0be58cacf65575d45f79c5cc1a79
2023-07-24 09:23:04 -07:00
Bill Yi
47855826c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1927131129b72df309406cf5dfe3a37b7d94e71c
2023-07-24 09:20:40 -07:00
Tetiana Meronyk
6b27c08150
Fix keyboard showing after dialog dismissed
...
When dialog for creating user was dismissed with keyboard being displayed, the keyboard stayed on the screen and could not be released due to incorrect list of methods called on dialog dismissal. This CL topic fixes onDismiss() behaviour of this dialog. Videos of current behaviour and behaviour after fixed are attached to the bug.
Bug: 291865725
Test: atest UserSettingsTest
Change-Id: Ib3ade3de9228c8ba24e7ac2e235aaeec45efbe4e
2023-07-24 10:30:32 +00:00
lbill
a851e68272
Fix no vibration when enroll init stage after receive onEnrollmentHelp
...
Change the behavior of vibration when
1. Init stage, don't vibrate if onEnrollmentHelp invoke
2. Then next enroll progress update, should vibrate
Note: This onEnrollmentHelp is invoked by FINGERPRINT_ACQUIRED_PARTIAL
Test: Should vibration when the progress 1st indicating after lightly press
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 290723009
Change-Id: Ie056aac8b3251fb3da6dccd95254fb30628fa65e
2023-07-24 07:23:12 +00:00
Charlotte Lu
9d961b01ab
Merge "Button text to turn off the sim" into main
2023-07-24 05:01:43 +00:00
Treehugger Robot
63997b38d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c -s ours am: b6d9a8bca0 -s ours am: 677dddc207 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I120b9dff249714ed1ee15d27d611def8bb74e836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 04:00:14 +00:00
Bill Yi
abbef13958
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours am: aab0565203 -s ours am: 0493fac734 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I0d92e67c9def854d3e8bed42c71bf0e20aaafc73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 04:00:11 +00:00
Treehugger Robot
13850f1ca1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours am: 2987136500 -s ours am: d33d2f9961 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Idbf6013e57497295a3239bb9a1d4c104d99a21b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 04:00:04 +00:00
Bill Yi
3d2fa1a73b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39 -s ours am: 6eb9b90a08 -s ours am: 4720aa2d41 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Ia604c41ac66504b128ed6941f2b4743079983a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 04:00:01 +00:00
Treehugger Robot
11a6b43bb8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours am: 64faf68d0b -s ours am: c2095808b6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Idcefb5a728fb1acc440c2e81b057934724d276e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:59:47 +00:00
Bill Yi
3e7a7d2a03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f -s ours am: f7ef6eb13d -s ours am: 25771320fc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: I35cf6d583be34fd557a6d48de83fe6f226a672ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:59:35 +00:00
Treehugger Robot
d07c0fc18d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c -s ours am: 72d72142f0 -s ours am: 1d866ad1a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I9f1407f6c4716ae5fbc450f38b3836de2072d1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:56:28 +00:00
Bill Yi
20818285c6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours am: dbc0def786 -s ours am: 3728554a6b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: Ic84b9a1f4db67b4ee1257b6d38e074504c0b4490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:56:25 +00:00
Treehugger Robot
d5a6f8784d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours am: ebcadf93c6 -s ours am: 7998f579f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: I7988f7a2a0e0d237bd8d6893d968f43be064de9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:56:20 +00:00
Bill Yi
1a0e766af5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39 -s ours am: 2e3d3c1669 -s ours am: 5f92c814ef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Iad6806b4626693e849fe9fd8d3ed90376356a766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:56:17 +00:00
Treehugger Robot
78bb06d7d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours am: 53394f7084 -s ours am: 3d5b922b47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: I67e01a83d0b8721d6f563c47814f091edb18fa2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:56:04 +00:00
Bill Yi
8493885c77
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f -s ours am: 05f5af2a34 -s ours am: 48bea25cfd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: Ia24fc70da0219481f4f1daf6cc2159e13a8b99a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:55:51 +00:00
Treehugger Robot
677dddc207
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c -s ours am: b6d9a8bca0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: Iec18925ccbcfe6ac939e89434b12e8ff59dd5945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:42 +00:00
Bill Yi
0493fac734
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours am: aab0565203 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: I97877c0e089d327fb73aba26c57dd113a70a7b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:39 +00:00
Treehugger Robot
d33d2f9961
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours am: 2987136500 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Iefe3be8ea9537f0afdee54be29ecfb0e162a8b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:34 +00:00
Bill Yi
4720aa2d41
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9caafcc39 -s ours am: 6eb9b90a08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Ib6c3797ebdf7cd8e5b15bc9e24c262f40681459e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:29 +00:00
Treehugger Robot
c2095808b6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d52951de52 -s ours am: 64faf68d0b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: I773917abac5a68bce0990ee1c290e8a2fb6526d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:15 +00:00
Bill Yi
25771320fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60714bfa6f -s ours am: f7ef6eb13d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153451
Change-Id: I1c604a651b2878f08ea48c823303d0af68147446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:33:05 +00:00
Treehugger Robot
1d866ad1a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90d628186c -s ours am: 72d72142f0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: Ib58d1b83283c35fb6040dcbee21e593c18c07483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:15:04 +00:00
Bill Yi
3728554a6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2819e72250 -s ours am: dbc0def786 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153453
Change-Id: Ia9fa25321488edbf6de5d6428c2381dbb5b80462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:15:02 +00:00
Treehugger Robot
7998f579f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 22e1df0c7e -s ours am: ebcadf93c6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24153452
Change-Id: Iea65b07ebcd4c8beb9826d5ba231981f306e1022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-22 03:14:57 +00:00
