Commit Graph

85572 Commits

Author SHA1 Message Date
TreeHugger Robot
6e28f3e442 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b081a94e8 -s ours am: 4924f944c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a224c3f1b4dd2f9262776eb05a887ba122e7992
2021-07-05 01:51:35 +00:00
TreeHugger Robot
d8c43dd7c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b081a94e8 -s ours am: f2795ba6f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I29c4ef7ecb506fc295e4c65559357b59925f51d4
2021-07-05 01:51:14 +00:00
TreeHugger Robot
f2795ba6f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b081a94e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5889375cd5b70336179ac527317b1d17669ba8b0
2021-07-05 01:39:24 +00:00
TreeHugger Robot
4924f944c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b081a94e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5d5bac527f9e6812a8c4444e9e8305e81a04b94
2021-07-05 01:38:31 +00:00
TreeHugger Robot
8b081a94e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-05 01:21:22 +00:00
TreeHugger Robot
2a67e43a79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bd20706443 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb6118fd2701c30df32c8ba1f60b72817b17180d
2021-07-05 01:16:01 +00:00
TreeHugger Robot
bd20706443 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-05 01:03:04 +00:00
Bill Yi
b994661fed Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic1804cfd1742bbf191919f9807bcb30e34c3434b
2021-07-04 22:42:00 +00:00
Bill Yi
05728aa3a9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I60ed13bac2a0c0dc4aa5ef847ba147994a3adc4d
2021-07-04 22:38:10 +00:00
Rajeev Kumar
273bfac7b6 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1 am: cb6334ba99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: If0e07bf42325ace605b2e0ae70919c286d8d6d9b
2021-07-04 20:59:53 +00:00
Rajeev Kumar
69331d742c Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1 am: 69bd5a4fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: Ib49c1f6b9b20972ba0bab335218fd09593830b62
2021-07-04 20:53:31 +00:00
Rajeev Kumar
cb6334ba99 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: I644fac2d129a2b4226263f5a9f2ffe268c31bbb3
2021-07-04 20:08:02 +00:00
Rajeev Kumar
69bd5a4fc5 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: Ia3fa8931d4278b870ff595d5fa613f58bca38261
2021-07-04 19:48:23 +00:00
Rajeev Kumar
dc07fe1ad1 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev 2021-07-04 19:14:33 +00:00
Treehugger Robot
361c5eb1b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours am: 3d1551cf4e -s ours am: cf8188baeb -s ours
am skip reason: subject contains skip directive

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

Change-Id: If774e5eb02b0f6668bcf32710fe50586a5fa1471
2021-07-04 18:01:08 +00:00
Treehugger Robot
b9841e5fd6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 964006012c -s ours am: ac888d4bba -s ours am: 5a1d7d88c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b4ce2e5e75d5b9d6d46e2e315815e8d4e20e6b7
2021-07-04 18:00:05 +00:00
Treehugger Robot
cf8188baeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours am: 3d1551cf4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79a9f371619fa95aacbe108a4b287e282b4e45b0
2021-07-04 17:27:57 +00:00
Treehugger Robot
5a1d7d88c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 964006012c -s ours am: ac888d4bba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I357f048b9db085f0c6706e707784725c0af4eed4
2021-07-04 17:27:40 +00:00
Treehugger Robot
3d1551cf4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c3dd739c8052f2ecc5152900ba1cfb61de52aa9
2021-07-04 16:59:18 +00:00
Treehugger Robot
ac888d4bba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 964006012c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84923d0689ef90a2999535776674f83d33a3ab91
2021-07-04 16:58:24 +00:00
Treehugger Robot
88d39847b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 16:00:20 +00:00
Treehugger Robot
964006012c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 15:58:19 +00:00
TreeHugger Robot
2715acd196 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 260e662a6e -s ours am: 741686fe63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47e00fa13a97cdc30636d8346d3ec4ac262b3dd1
2021-07-04 06:04:36 +00:00
TreeHugger Robot
459ca1bfe1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 61d76c1bcb -s ours am: 25b618f8f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5b94255177197bd65daf5153314b811b8fd9e08d
2021-07-04 06:04:32 +00:00
Bill Yi
d7600d8159 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3bdbe0be2 -s ours am: a06b08e31b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I621b02545d025e61383f349a767037dda26c1de8
2021-07-04 06:04:20 +00:00
TreeHugger Robot
741686fe63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 260e662a6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a568dccc1da55e2d7405cbee6e2d4b932521bae
2021-07-04 05:54:33 +00:00
TreeHugger Robot
25b618f8f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 61d76c1bcb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8518207df766a1146c79e50bed450d077804e63
2021-07-04 05:54:14 +00:00
Bill Yi
a06b08e31b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3bdbe0be2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1c80568a5919d9f1c42804fb92c115ca0cae96b
2021-07-04 05:53:42 +00:00
TreeHugger Robot
260e662a6e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:47:31 +00:00
TreeHugger Robot
61d76c1bcb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-07-04 05:40:32 +00:00
Bill Yi
2da15f5ff7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f0092859ef116b815fb7b0b808d26382f09a8e4
2021-07-04 02:58:11 +00:00
Bill Yi
b3bdbe0be2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I46da67c58691feb24e1ce202fe42e00cc234bd08
2021-07-04 02:56:39 +00:00
Bill Yi
3bddbf2fa5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1cbcb60c8c6e694c72af468b580cc27f72f2a7fe
2021-07-04 02:53:23 +00:00
Bill Yi
ac0886d754 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id854c59331a03cf9a05828b1062e3c750c8603ba
2021-07-03 18:45:56 -07:00
Bill Yi
18708c4f00 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac0b5598da3ee6dedf95d2cb9f6e32109d9f19af
2021-07-03 18:42:49 -07:00
TreeHugger Robot
2c74212e75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours am: f842525a16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied209ba1ce51636063439257a2aeb8423023a615
2021-07-03 04:18:56 +00:00
Automerger Merge Worker
77bb19aa78 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours am: dea9ddb667 -s ours" into sc-v2-dev-plus-aosp 2021-07-03 04:18:42 +00:00
Bill Yi
c38ea824ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours am: dea9ddb667 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic994b50ac13ba7cefff09606e383f5799b2fa098
2021-07-03 04:18:39 +00:00
TreeHugger Robot
81b6fe9dbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours am: 6bd9edeb4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I079ff5b21972d862f24acd50ff6a07679315dc3a
2021-07-03 04:18:34 +00:00
Bill Yi
4af46b3e50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours am: e22dc6d4e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia59426537541f839acd8d72cbd73d2cafd5be1bd
2021-07-03 04:18:28 +00:00
TreeHugger Robot
6bd9edeb4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba2fe1ca73e90e83827338b187d7b909a8881928
2021-07-03 04:08:18 +00:00
Bill Yi
e22dc6d4e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6fa9087d71ab724571cb1066c2d2d323534d30a7
2021-07-03 04:08:14 +00:00
TreeHugger Robot
f842525a16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e1ef076ca2bfefa3c8aad9b405be159181db1e2
2021-07-03 04:07:37 +00:00
Bill Yi
dea9ddb667 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ade5cff85a5021451c439d40af5f7c73c8e8a14
2021-07-03 04:07:07 +00:00
TreeHugger Robot
e03051747f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours am: b9a9b7c6d2 -s ours am: 143f419895 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a147241bc3a3ba608658410ddc30d66c560e155
2021-07-03 04:01:22 +00:00
Bill Yi
aad4a11ae3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours am: 5cc1907655 -s ours am: 8d4727a3be -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc45ac4d05b62452e041485a23903697e969e551
2021-07-03 04:01:17 +00:00
TreeHugger Robot
296c7a60aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3dd0be61d1 -s ours am: b9a9b7c6d2 -s ours am: 08666ce16b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57f99628fa6810eecbf42b6dbbdf2d48de9097a4
2021-07-03 04:01:13 +00:00
Automerger Merge Worker
321ebd3b5a Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours am: 5cc1907655 -s ours am: 92c50044ca -s ours" into sc-v2-dev-plus-aosp 2021-07-03 04:00:29 +00:00
Bill Yi
2187817586 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6542938cff -s ours am: 5cc1907655 -s ours am: 92c50044ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02150838eb6b9d229870e7780fa3b0aada947c23
2021-07-03 04:00:26 +00:00
TreeHugger Robot
010ea5488d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9178f7fe03da40f82a9d4a76c8e489d579b23dca
2021-07-03 04:00:18 +00:00