Commit Graph

84715 Commits

Author SHA1 Message Date
TreeHugger Robot
15118dbc4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours am: 6225c4a3af -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia57333d8312b885835960bdc01e8a58a153f9af0
2021-06-24 20:52:08 +00:00
TreeHugger Robot
6225c4a3af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I573848bc5bd6cfd18ae7e73fe2b2679dc155261a
2021-06-24 20:42:25 +00:00
TreeHugger Robot
48386d90db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours am: 510d842992 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a1d18fb20f856c2aedb7e2292d187e6d35c8e6b
2021-06-24 20:32:33 +00:00
Bill Yi
5026a41048 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours am: 6ace7cdcb2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ccb4fa2b14ccd342217a2ebcedb052641d0e815
2021-06-24 20:32:29 +00:00
TreeHugger Robot
9f8f4b76ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours am: cb3096af34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91135b124c0e8cb72fa7406b370de63622c0aed0
2021-06-24 20:32:26 +00:00
Bill Yi
2aba6cdc90 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: 3716c2a75f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91e342c6316a2c2bc43197da5e24530fbe88d33b
2021-06-24 20:32:22 +00:00
TreeHugger Robot
3cf6d9a4e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 2ac3bc7a2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7130c76c95850caf538d91acb67a71caec346d88
2021-06-24 20:32:14 +00:00
TreeHugger Robot
54c1ff8489 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 20:25:56 +00:00
TreeHugger Robot
72365e1ed7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours am: 154bab9830 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f0aed09f99277302dbe31319854743900f1b61c
2021-06-24 20:25:13 +00:00
Bill Yi
2ba9db792e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours am: a6268f29d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b46f6dab2b52db099c9dad674264b933e78f34b
2021-06-24 20:25:09 +00:00
TreeHugger Robot
2972123126 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours am: bdf534d2c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ea0a3b0d2a73c18152e775fb5025e37ddf52e80
2021-06-24 20:25:00 +00:00
Bill Yi
6e950044c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: fb3e0ff793 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieecc207cc00de40fefa1f8d4fc8d8701f93c3db1
2021-06-24 20:24:46 +00:00
TreeHugger Robot
c4226d3a59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 76a6621428 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied8daaa67a92cfcf08ecae26eeacb9b0863e1d91
2021-06-24 20:24:23 +00:00
TreeHugger Robot
154bab9830 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If88af61c543edb467acd77ad807c58c807d14a82
2021-06-24 20:18:00 +00:00
Bill Yi
a6268f29d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fa08277478fabc70550a90061e1759ebf18ca00
2021-06-24 20:17:52 +00:00
TreeHugger Robot
510d842992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours am: b8bd54cd94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48915126bede1c00e53af1f9f85414a9fb7f6034
2021-06-24 20:15:26 +00:00
Bill Yi
6ace7cdcb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebc27f5c780f1483cc216fde9ec712a2bd4f1066
2021-06-24 20:15:22 +00:00
TreeHugger Robot
cb3096af34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic835ded7c7cf0409344720eb663153b6a6df1b6c
2021-06-24 20:15:18 +00:00
Bill Yi
3716c2a75f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecb99258b8a0a0acbefbabb11d17b8a8b4d1cf16
2021-06-24 20:15:14 +00:00
TreeHugger Robot
2ac3bc7a2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1fcb35daec8ac19969b6181411407ae1b391ff95
2021-06-24 20:15:05 +00:00
TreeHugger Robot
b8bd54cd94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I157969d7a1a3f3b5cab29f3e9ecec9e3c89dba92
2021-06-24 20:14:39 +00:00
Bill Yi
3e45d30cfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9e55bbaf2f5d03312deca10c09c21658eb7fb2d
2021-06-24 20:14:30 +00:00
TreeHugger Robot
bdf534d2c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic180a496da127ae4832a6e53591596ceb21d1dcf
2021-06-24 20:14:22 +00:00
Bill Yi
fb3e0ff793 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4328059d85cca375428226fb962bffe3141c06eb
2021-06-24 20:14:17 +00:00
TreeHugger Robot
76a6621428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcd09b7c0a3ab713a23fa91c239e617476f5e67e
2021-06-24 20:14:06 +00:00
TreeHugger Robot
0e1287502f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaea10d18ec08b69975f0f172e3b1fc282f8db64a
2021-06-24 20:14:05 +00:00
Bill Yi
06ffb62957 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic10837a5f31ad798d1b9d43cadf6eb52300e4975
2021-06-24 20:14:00 +00:00
TreeHugger Robot
3fb4a97104 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca62b8d0aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f69937d7673d2ac4e085bdf4e1609a39a17c5b2
2021-06-24 20:06:40 +00:00
TreeHugger Robot
e690d1c9ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42202ee3f1cc9bda4992b7db492ef2db750cc245
2021-06-24 20:06:15 +00:00
TreeHugger Robot
483f978ba7 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-24 20:02:41 +00:00
TreeHugger Robot
fa6b455bd0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-24 19:58:49 +00:00
TreeHugger Robot
edeef947e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 19:56:59 +00:00
TreeHugger Robot
ca62b8d0aa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:48:40 +00:00
TreeHugger Robot
c67736416d Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I439b5978c024cd1a7eed3620725aa4733e94a42c
2021-06-24 18:48:21 +00:00
TreeHugger Robot
e9d4220cfe Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 15e4ca6442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ic4ad40ca7669ba1a0890185c18e320f38e7b5ff9
2021-06-24 18:47:56 +00:00
TreeHugger Robot
15e4ca6442 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ica9979965368a4aa9c42931441729290b6bd174b
2021-06-24 18:32:57 +00:00
TreeHugger Robot
6916b17c04 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Id9ccc2ce6ca576f3949b1519019842201a2862de
2021-06-24 18:30:59 +00:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +00:00
Curtis Belmonte
a64d135498 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I5834c4c4bb2d555cedb6cad78731c011fb82b475
2021-06-24 18:08:18 +00:00
Curtis Belmonte
cc2b22c85d Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: 911fc6569b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I623be69d55c75db51c6f5f5021facc954b2d80d3
2021-06-24 18:07:59 +00:00
Curtis Belmonte
911fc6569b Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I8dbc2baf032d6d4dc7af46a80775d33fb7572928
2021-06-24 17:59:01 +00:00
Curtis Belmonte
e3c31297b2 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I915e1b3e6623a30fb3fd9be75bccdb5c13c359a9
2021-06-24 17:58:07 +00:00
Curtis Belmonte
4de89a9361 Merge "Use correct string for Face Unlock preference category" into sc-dev 2021-06-24 17:47:14 +00:00
Bill Yi
ae7989d729 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic0b8647c8319e2389b3e8bf0bf90edcfc9935d25
2021-06-24 15:51:28 +00:00
Bill Yi
e93a98e06b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95f8f317ddf4f40de75a9d7171960ca430dc0cd9
2021-06-24 15:47:17 +00:00
Bill Yi
d1c25e8dfe Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I62eace4a91508f8f27ab37d4cb9a464ba6417f4c
2021-06-24 15:39:29 +00:00
Bill Yi
a83bc881f6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
2021-06-24 15:37:57 +00:00
Quang Luong
be9ca3b1cb Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: c017fdda03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I927165a8c3edd1069bfbd0b0358e89db3e70cc8c
2021-06-24 15:37:51 +00:00
Quang Luong
06ee380015 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: f151a04d43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I4062970e264d439c01c3d9d741080e127b999689
2021-06-24 15:37:37 +00:00