Commit Graph

86616 Commits

Author SHA1 Message Date
TreeHugger Robot
71cb764e1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours am: 5af512fa91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21f4ae8c8745c62eb1bd9072d33cbfb53f7ee539
2021-08-13 22:04:48 +00:00
TreeHugger Robot
29fa1d02b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours am: 40094149eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I296f1aa85fd457e3affecdbaabb6d67483bcb106
2021-08-13 22:04:28 +00:00
TreeHugger Robot
3fc13ba9f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours am: 1add1250a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I555c2c5786677d3a8d1b228ebae6913e6816500b
2021-08-13 22:04:04 +00:00
TreeHugger Robot
fe687b44c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours am: e5bdfacb0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d158910d4f6b7479dbd610c6563a7ea3a4e7929
2021-08-13 22:02:12 +00:00
Bill Yi
ca04371b27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours am: 4310165e62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1993dd480e0c7cbad3ce46f8996cbeb33ccf4d9f
2021-08-13 21:58:04 +00:00
TreeHugger Robot
a910c6c52d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e4e2fb715f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7cd4b4f8381f7cd23e54b2217ef492ac61189df6
2021-08-13 21:38:01 +00:00
TreeHugger Robot
ca1bbb9f09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: e245bf8e66 -s ours am: e4de411880 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6afe1e73bf229e8ea056dbf47e53d83fdf7595d
2021-08-13 21:34:32 +00:00
Bill Yi
c303aa8b0c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours am: 4d68983581 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b86bd0df673f2e41d41bce1934c37ded3a8141d
2021-08-13 19:56:31 +00:00
TreeHugger Robot
e069033c61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa782b4578 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45a563823b85397a1c6bccc7fec8311cbaa4e255
2021-08-13 19:27:00 +00:00
TreeHugger Robot
5af512fa91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie77229885fbe65b914ffe2a986d93256bee5279d
2021-08-13 19:15:06 +00:00
TreeHugger Robot
40094149eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I312447fd21b55256cd33eda8640e7e23357a04f8
2021-08-13 19:13:37 +00:00
TreeHugger Robot
1add1250a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I412835c767934fb8f9f5dd406249edaa32ddfc4c
2021-08-13 19:12:21 +00:00
TreeHugger Robot
cc5b59c9a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43fffed8c0c65794a17abeaea2a64e76a318000e
2021-08-13 18:56:01 +00:00
TreeHugger Robot
7508bd0cd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fcd4bde39ddac78133671de50de523056314084
2021-08-13 18:55:57 +00:00
TreeHugger Robot
96bd289bf7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I947c5595859294f600c17d4d3286769211f2e7a3
2021-08-13 18:54:45 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
e5bdfacb0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3feefe86f4c68e4347e7b6b4a9d3dce52e1cc10
2021-08-13 18:40:06 +00:00
TreeHugger Robot
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
Bill Yi
4310165e62 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic4bf87dc21cbf54df06681ed964032e1bf5a6076
2021-08-13 18:39:31 +00:00
TreeHugger Robot
e4de411880 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: e245bf8e66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I330cd109eef07b6ad94f221b946ac70c46f6f484
2021-08-13 18:33:43 +00:00
Bill Yi
4d68983581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cc31a337e002d9cddd3e5c42966a0059a0786c3
2021-08-13 18:32:56 +00:00
TreeHugger Robot
de4d5cb3f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31207099de86903024e9d1b4a7e272e312a5cfcf
2021-08-13 18:22:30 +00:00
Bill Yi
4a7acc1636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9390d5d0ecc35c365747ecead6f3cb48ff8eb95
2021-08-13 18:22:28 +00:00
TreeHugger Robot
e245bf8e66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93a887f210b6bbea351522f0d423664c25715871
2021-08-13 18:21:24 +00:00
Bill Yi
e7eff15e83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ba31d3695cdea83bbdbc505fee4ccfab6fc9faf
2021-08-13 18:21:09 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
TreeHugger Robot
e4e2fb715f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:54:53 +00:00
TreeHugger Robot
fa782b4578 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:47:46 +00:00
TreeHugger Robot
58dcefef22 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: f1772f686b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Iba1b42b2e38903fcff5be73b894d047a94d9bdf2
2021-08-13 15:21:14 +00:00
Joe Bolinger
86aebc1ea3 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 725619f6a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I01a99168f28500597ec4f43175b3f91355c6fac0
2021-08-13 11:41:44 +00:00
TreeHugger Robot
fb60c7664f Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: 597ca951a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I5c096d2b447c8012dc7b7cd27598585651123e60
2021-08-13 05:38:45 +00:00
TreeHugger Robot
f1772f686b Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Id581e29e3b2ec42a93846d1878caf9bee334fa3b
2021-08-13 04:27:15 +00:00
TreeHugger Robot
597ca951a9 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c Merge "Handle spanned conversation labels" into sc-qpr1-dev 2021-08-13 04:11:04 +00:00
Joe Bolinger
d703385e2a Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90 am: 3872ed4b8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I43dd97bbb63d018fbefb187998e6a59c7000cbd5
2021-08-13 03:56:35 +00:00
Kevin Chyn
e8b0c5e93c Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: bf8ad9f293
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I6a81869653a56c3e0830865e1581662ba53a36f1
2021-08-13 03:56:27 +00:00
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
2021-08-13 03:48:58 +00:00
Bill Yi
ec12fdf789 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28896b0ff317484fc7b22d7152bd99720b247df9
2021-08-13 03:46:10 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
2021-08-13 03:42:27 +00:00
Bill Yi
a89104fd31 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I52b666d62c7fa29e7b98ef5648952726ef34f1c8
2021-08-13 03:34:34 +00:00
Bill Yi
d9ba125bb8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
2021-08-13 03:24:52 +00:00
Joe Bolinger
ba21ddcc35 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 74efeebf5c am: 0c8e25d2f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I2628d6122ec21c0ce65b22d6e880adde90dd0dfa
2021-08-13 02:56:11 +00:00
Kevin Chyn
6b6d641f21 Do not show work profile strings for parent-managed enrollment am: 570540b15c am: a92e3d9a03 am: 9e7a7cc40e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I79eb30cd8404fe6838f3d761bcfc11155f1c0b3c
2021-08-13 02:56:01 +00:00
Kevin Chyn
d9123f2bc9 Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8 am: 65f7fbcd8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I888bc6147611ce740472046327efe1b1a2b9c777
2021-08-13 01:26:53 +00:00
Joe Bolinger
725619f6a0 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I9531bd1ac329830db723ffbd28625592702c4a11
2021-08-13 01:21:35 +00:00