Commit Graph

91648 Commits

Author SHA1 Message Date
TreeHugger Robot
a29275a16f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 377b335b84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icab31948df3c09c319599f7f01d8513f043e9dc7
2021-07-05 01:23:42 +00:00
TreeHugger Robot
a7c5f7f1a0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-05 01:21:53 +00:00
TreeHugger Robot
377b335b84 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-05 01:14:32 +00:00
Bill Yi
817d2de1f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia2a27aa6b5b6782030913ad5cfd33bb9dc0dfa27
2021-07-04 22:34:14 +00:00
Bill Yi
e601abf9c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I41e55cee77fbc3d604b9616f47a66a88e0c3a6e8
2021-07-04 22:18:12 +00:00
Rajeev Kumar
8f57828219 Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1 am: cb6334ba99 am: 273bfac7b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

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

Change-Id: I6a5926e98c4cdbfd361d73e19e75ac32be9f203a
2021-07-04 21:04:51 +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
b1a82dde1d Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1 am: 43b16c4704
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293

Change-Id: Iab510479a2b4b7ecab8406e142a7c9853aab4400
2021-07-04 20:53:31 +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
43b16c4704 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: I39af0d099e45634c19aa8bad49cf980e883d19a9
2021-07-04 20:23:27 +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
2c8a059f0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88d39847b9 -s ours am: 3d1551cf4e -s ours am: cf8188baeb -s ours am: 361c5eb1b9 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I38d23e7aa9f69ad4c281b41dbf6a44bba3061dec
2021-07-04 18:27:52 +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
e8a80850c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 260e662a6e -s ours am: 741686fe63 -s ours am: 2715acd196 -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: I671dfc53084ecee9da870cb47067061ad9a1875a
2021-07-04 06:13:14 +00:00
TreeHugger Robot
7bbc44a99d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 61d76c1bcb -s ours am: 25b618f8f9 -s ours am: 459ca1bfe1 -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: Ieb1bf73d68bbe39dbcc43b3628c64be6df3d197d
2021-07-04 06:13:08 +00:00
Bill Yi
25b2ff8445 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3bdbe0be2 -s ours am: a06b08e31b -s ours am: d7600d8159 -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: Id81ce7b4a1647c91e5390342313795e115974aa9
2021-07-04 06:12:49 +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
f21f8edf4c [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: 2c74212e75 -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: I9f405f6a8241e06af5f56656d96b7720f38ab794
2021-07-03 04:29:44 +00:00
Automerger Merge Worker
973d7aea24 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 am: 77bb19aa78 -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: Ic009b43f0c7d7d6a932886f783a4971d5a34c408
2021-07-03 04:29:38 +00:00
TreeHugger Robot
8345f834d5 [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: 81b6fe9dbd -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: Ib7ad1ce60437bf1294574a8cdab64f6aeaa9d137
2021-07-03 04:29:32 +00:00
Bill Yi
14e21b2dad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c91f40f0 -s ours am: 42ead3c52e -s ours am: e22dc6d4e7 -s ours am: 4af46b3e50 -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: Ia89564b9290616beb734f5593e4aa79a5814d347
2021-07-03 04:29:22 +00: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
TreeHugger Robot
08a3291483 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a69ea45cf7 -s ours am: 010ea5488d -s ours am: 2bf090214c -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: Ie823115848a9f4d6cf6d682ac895ecfbbea4c3a2
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