Commit Graph

90175 Commits

Author SHA1 Message Date
Bill Yi
4a92a84003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f -s ours am: 3e45d30cfb -s ours am: d8c874e5c6 -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: I5431685d903a98466027994827d8d147c39af823
2021-06-24 20:23:29 +00:00
Bill Yi
d8c874e5c6 [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: I9f329c4702d335f325c18b3f6c7d44734ebc4fde
2021-06-24 20:18:37 +00:00
TreeHugger Robot
033bce6ee6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0 -s ours am: 0e1287502f -s ours am: 8acff55c46 -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: I7c6bb3f283c8526dc19eabc0d48a83a565e11802
2021-06-24 20:14:42 +00:00
Bill Yi
79cdc61fed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851 -s ours am: 06ffb62957 -s ours am: 8068e3e113 -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: Ib7a93e18322d4e6218bb4c8eb2e6ce49263d607a
2021-06-24 20:14:37 +00:00
TreeHugger Robot
cf4a21ede2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 43314e95e3 -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: I295fc7568a795bbfc9d262dda902673d39c4355f
2021-06-24 20:14:32 +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
8acff55c46 [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: I864d92ebb5b96acfbfb11d67f69a11487a2841d9
2021-06-24 20:14:23 +00:00
TreeHugger Robot
717c2dc9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 566af4c8b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb64d9e9135f6827af5d8ea671f1e34f407d4eac
2021-06-24 20:14:19 +00:00
Bill Yi
8068e3e113 [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: I704abc5fc36321a1c17d389e31c3f2fcff9dee23
2021-06-24 20:14:18 +00:00
TreeHugger Robot
43314e95e3 [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: I7fce26fc05303b095d38f37ed2d47fcde834c66b
2021-06-24 20:14:09 +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
TreeHugger Robot
2067e288be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9a5c27355b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9714f9b77d23e3932f648d53fe56c4886c9ea298
2021-06-24 20:14:02 +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
566af4c8b9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:45 +00:00
TreeHugger Robot
9a5c27355b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:43 +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
1137b018f4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 19:54:30 +00:00
TreeHugger Robot
190323d696 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04 am: c67736416d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

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

Change-Id: I112d957fa6683eaac44394820baa07634e0583a2
2021-06-24 19:12:49 +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
fa6415f1d2 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 5c134ad624
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ie9a94e24909310b915f81a889a9ff3e0e48c0e7b
2021-06-24 18:47:32 +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
5c134ad624 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: I2a8343d2c07d916eb12c83dbe8bd6efa2f00df12
2021-06-24 18:32:06 +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
Curtis Belmonte
2fb8f498ff Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2 am: a64d135498
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

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

Change-Id: Ia321471296ec4db5bd6f13b7b17ecbde4c616445
2021-06-24 18:21:45 +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
18e4a4b040 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: af954c7351
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I4b94541df38351e22c8517d3d57b77e9b1610f05
2021-06-24 18:07:38 +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
af954c7351 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: If8d3f4f71691384312efbbb032f776a123feb307
2021-06-24 17:59:00 +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
Quang Luong
c88fdc144d Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: c017fdda03 am: be9ca3b1cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

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

Change-Id: Ib2dd23ef4dc71a2680a5c8c6a19e5516a620b303
2021-06-24 15:50:14 +00:00
Bill Yi
528c9aa1a6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9f83e0ea5eb8bbfc59c1bd4c63ac9acca9a23588
2021-06-24 15:43:10 +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
Quang Luong
e93e8fe2d5 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: 5f5068f6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I6f654bda50a93deed9dcb4fa6b61f87dd8e296f3
2021-06-24 15:37:17 +00:00
Bill Yi
1ff9267e5a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idda50c4476939eb34180e330eb2d8ffc1ceebafe
2021-06-24 15:33:28 +00:00
Bill Yi
342b2ae851 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic8d9a3522550591b80fc7cd8470d939c324443ef
2021-06-24 15:29:50 +00:00
Quang Luong
f151a04d43 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
2021-06-24 15:27:38 +00:00
Jeff Sharkey
7ba49c3b02 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: cf5988db8a am: dc8d4365bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

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

Change-Id: Ia04e46f443afce296bd76ffa85da4bd0647390d2
2021-06-24 15:27:02 +00:00
Jeff Sharkey
eeadb807e5 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 60256a980e am: 9bec21269c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

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

Change-Id: I6d99ce94d10c99294cfd001fe4454e52314bf14b
2021-06-24 15:26:37 +00:00