TreeHugger Robot
119268df3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-s ours am: 8c307c4d67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I61d9fc85e7ffae0117b69e05423f7402d0603cbc
2021-06-26 05:24:25 +00:00
Bill Yi
43da1b001b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-s ours am: 3cad327a2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: I9cd1dca4bdf983e95990c82dd8038c46564b877d
2021-06-26 05:24:21 +00:00
TreeHugger Robot
929c3860be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours am: 926cffbbea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: If18b947bafefef0be6147d5962cc694616a8713b
2021-06-26 05:24:16 +00:00
Bill Yi
b3ae3367e7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours am: 76310b46a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I80ce7bc06e042ca031cb14aade3fa094c67e9587
2021-06-26 05:24:12 +00:00
TreeHugger Robot
d003b5deb2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115842
Change-Id: I588d2d6e70e1b14c6678801dc9fd453f6ebe987e
2021-06-26 05:24:03 +00:00
TreeHugger Robot
51fd3b4ae4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours am: cadaadb462
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I1ea27380501919a7219475dff83ecfc921dd85fe
2021-06-26 05:24:00 +00:00
TreeHugger Robot
7fe4564a4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I8c29941351f340836a96211583e67f4371e9ad38
2021-06-26 05:23:59 +00:00
Bill Yi
6f34ea57ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: I44b519ea49dd847cdd65deb7cf0f9aff23ac2e5c
2021-06-26 05:23:53 +00:00
TreeHugger Robot
e325e43e75
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours am: 314dad2e61
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: Ib14f62f48d2db8eeea7f2f90d8381e27fd46c680
2021-06-26 05:23:45 +00:00
Bill Yi
1e160aa7df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours am: b994348b19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I12a8bb7932a40cdaebe713600f82a9de1c158f45
2021-06-26 05:23:39 +00:00
TreeHugger Robot
d7e98f11bf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours am: 83d55613d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I9619f166433beeefc2b9d0297c32eab990d453e5
2021-06-26 05:23:32 +00:00
TreeHugger Robot
409be78320
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115842
Change-Id: I8d3c33dceaeaef72c2a97bdf90543beefd2c75a1
2021-06-26 05:18:42 +00:00
TreeHugger Robot
8c307c4d67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I032ef821f36de9c3e353e7d90e701016fe1363f7
2021-06-26 05:18:38 +00:00
Bill Yi
3cad327a2a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: I859a0a0ce773858ce5a32ef9f4f78e236f506c17
2021-06-26 05:18:35 +00:00
TreeHugger Robot
1060b2f926
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 05:16:50 +00:00
TreeHugger Robot
e78163f7c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
2021-06-26 05:15:33 +00:00
TreeHugger Robot
926cffbbea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: I010737d72105e9540992237716af3747f510d440
2021-06-26 05:14:49 +00:00
Bill Yi
76310b46a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: Ib66d41ae033d461f6e26b3c59131eaa03f346df7
2021-06-26 05:14:42 +00:00
TreeHugger Robot
28dbcbf459
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-26 05:13:39 +00:00
TreeHugger Robot
314dad2e61
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: If3885e81393d34a70ad5b3e34889e3eebdd751f4
2021-06-26 05:12:19 +00:00
Bill Yi
b994348b19
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I2744c926e9f85a0afe710bc8ba6339c8b30e6db5
2021-06-26 05:12:12 +00:00
TreeHugger Robot
83d55613d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: Ibd4615d4087d13d26217b4b941a11df2adc85ae2
2021-06-26 05:12:07 +00:00
TreeHugger Robot
ce6e84f830
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
2021-06-26 05:11:35 +00:00
Bill Yi
28cd196a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
2021-06-26 05:11:20 +00:00
TreeHugger Robot
cadaadb462
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I044b2c9e790d1418f1c34ebae5d31b849290b3bd
2021-06-26 05:10:49 +00:00
TreeHugger Robot
1b194500c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 82c7e98261
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115840
Change-Id: I5319ef42351edad0b3e8f0a35cfb539ecfd4d6c6
2021-06-26 05:02:15 +00:00
TreeHugger Robot
75f02a46d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 347666014d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115843
Change-Id: I25babbfa4dc76315ed1294bb7c66f3f1806b6100
2021-06-26 05:01:53 +00:00
TreeHugger Robot
b92673984b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-26 05:01:37 +00:00
TreeHugger Robot
edea8a6799
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 04:58:47 +00:00
TreeHugger Robot
82c7e98261
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-26 04:50:27 +00:00
TreeHugger Robot
347666014d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-26 04:49:47 +00:00
Bill Yi
0ea1d883ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e0efc01f382094d5ce4884963635557e4be1370
2021-06-26 03:38:06 +00:00
Bill Yi
3d56d7be5c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1be53c98eb342d9fa588e3c953bf34cd9d12ba75
2021-06-26 03:33:56 +00:00
Bill Yi
60c0a41746
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81ad12d0a40b94a0526b57b78da36829cbe722e9
2021-06-26 03:25:20 +00:00
Bill Yi
9f28edb782
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
2021-06-26 03:23:44 +00:00
Bill Yi
130e0ec1ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e83b41c6c7836d1189d68db61d17f4261f4f920
2021-06-26 03:19:15 +00:00
Bill Yi
4f307c462f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If1e176b4aecb4b1db470d97eb30501c75f893dfe
2021-06-26 03:15:46 +00:00
Bill Yi
aa649a6fe5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
2021-06-26 03:07:35 +00:00
Bill Yi
ef757416ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
2021-06-26 03:02:32 +00:00
Joshua Mccloskey
038be0f496
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
am: 0d9161fd98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I91c313ce3f74d1ffbbcef940922717c383cf274f
2021-06-25 22:50:41 +00:00
Joshua Mccloskey
a32a4d6336
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
am: bb11038f28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I9c952b6ef63ca8850b72c7c967dcbff69bb0919f
2021-06-25 22:43:02 +00:00
Joshua Mccloskey
0d9161fd98
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I1fd58cd49bba98b21744b98697ec85ac0e27de4c
2021-06-25 22:40:40 +00:00
Joshua Mccloskey
bb11038f28
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I328f190dd86620ac874dbf5d18d2cabf9b88ea86
2021-06-25 22:39:06 +00:00
Curtis Belmonte
2d7a4ae1f2
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: 8383785335
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: Ib451fb9011dab4e2cd15548f45d54ce12d9b85e0
2021-06-25 22:37:34 +00:00
Curtis Belmonte
ef3c4de35b
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: f55508ca36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I4d778ffca11beaea5ef20598e5d0ef1fd2a07d0e
2021-06-25 22:37:19 +00:00
Joshua Mccloskey
477c5d9cde
Merge "Updated fp bad calibration string" into sc-dev
2021-06-25 22:37:01 +00:00
Curtis Belmonte
8383785335
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I431592731d3598a8e6d40c86754f7939de9ca156
2021-06-25 22:03:43 +00:00
Curtis Belmonte
f55508ca36
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I81bf482c5372078c1a07624a710a4c79f9ec9eb3
2021-06-25 22:02:54 +00:00
Curtis Belmonte
4aa1e532db
Update strings for choose lock password/pattern screen
...
Makes the following changes to the header/description text shown on the
choose lock screen:
- Remove references to "biometrics" in favor of "face or fingerprint"
- Add a default description when setting a PIN/pattern/password
Test: Manual
Bug: 191923052
Change-Id: I788fd03aaeea624fab548d1c055c5c6dee076e2d
2021-06-25 12:59:47 -07:00