Lin Yuan
15e4092ab1
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours am: 686679749b
-s ours am: 7d66c0ff97
-s ours am: 05c849c030
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: If81fe5de7048b8617149f9d5cb4360ec1aad7f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:59:22 +00:00
Lin Yuan
2667882654
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours am: aeab9be2c3
-s ours am: c24add0997
-s ours am: a4609cf869
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I88987012d1233b8ce01cf33aa611d4b9b7c9e386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:59:21 +00:00
Lin Yuan
05c849c030
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours am: 686679749b
-s ours am: 7d66c0ff97
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5156eccd0014ae1bfc6972b646ceca0fae2f3b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:40:36 +00:00
Lin Yuan
a4609cf869
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours am: aeab9be2c3
-s ours am: c24add0997
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5e41e42267770d766058bfd993f25dc0ea2f0355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:40:35 +00:00
Lin Yuan
fd627f9c1d
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours am: 18c00007b7
-s ours am: 148b2d99ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I5fcc7c247cbed5d03ac0f532cf5103b396ad8524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:25:48 +00:00
Lin Yuan
98c2b7b85d
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours am: 36b5a2c8d3
-s ours am: 9a8b9356d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: Icff0c124c3cc7dba36efc4dc586aeb79704bc552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:25:47 +00:00
Lin Yuan
7d66c0ff97
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours am: 686679749b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I9252560c3d4bb9ca5dd09410cef31c6618428dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:24:09 +00:00
Lin Yuan
c24add0997
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours am: aeab9be2c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: Ia8ef1d36e8b820813e707067099bba518cbd532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:24:06 +00:00
Lin Yuan
148b2d99ba
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours am: 18c00007b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: If3bd1866990498d776eea19a1bdd5e33741bf4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:58 +00:00
Lin Yuan
9a8b9356d1
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours am: 36b5a2c8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I501d3331159e68f40e6ad67f7369e69c89c87960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:57 +00:00
Lin Yuan
686679749b
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours am: 02ca401236
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I86a9c8a3b175a0ea3b3bec1bb7944c98c0b965f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:42 +00:00
Lin Yuan
aeab9be2c3
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours am: 9d3371ee23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I6034dd98bb748d2045b2bf50e35931e6f0bb0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:06:40 +00:00
Lin Yuan
18c00007b7
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
am: 95d21bc12f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: If27537456da8f42e9b0384c5b72e884b1afbc68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:28 +00:00
Lin Yuan
36b5a2c8d3
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
am: d78ed7aa73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I33890f4ba7d155d21551aee115257c788997b065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:26 +00:00
Lin Yuan
02ca401236
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
am: 36069908ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I60fb0e9e0c915cf5dd4441939efe462a53b3683b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:24 +00:00
Lin Yuan
9d3371ee23
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
am: 4daf65ea3b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I2eafef534fcd1662ca91d499fc1751b98e34fa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:51:20 +00:00
Lin Yuan
9270941726
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
am: 381d6120b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Ifd2a8bbd74365df0998917bfa360b3148157dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:55 +00:00
Lin Yuan
e8887ee639
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Ib1e30972098ad4a5ba86c1c02092a7d0fc57ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:47 +00:00
Presubmit Automerger Backend
128d5ad006
[automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
am: b7ebd6e3a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I4fbb2409a9dd9ef9ad9eef90b135d4ac50636c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:45 +00:00
Lin Yuan
36069908ce
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5e3c940b4dda8b6b6802c2c49260bbad1e661372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:50 +00:00
Lin Yuan
4daf65ea3b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I879d097018e3d4f99d9a8e9f788820a0729d8b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:48 +00:00
Lin Yuan
381d6120b7
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I043e7119d2fe281f085ba99ff12759dc588be57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:16 +00:00
Lin Yuan
95d21bc12f
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I6fdfb9076352a14d139425965fd091a70b7c4f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:00 +00:00
Lin Yuan
d78ed7aa73
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I1d6ccb2b76503875626f5422db30b90442114f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:32:59 +00:00
Lin Yuan
d765af048a
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev
2022-06-02 19:59:49 +00:00
Lin Yuan
3a95e552c6
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev
2022-06-02 19:59:42 +00:00
Lin Yuan
97c15312fa
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev
2022-06-02 19:59:35 +00:00
Lin Yuan
0920be7e46
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev
...
* changes:
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
2022-06-02 19:59:35 +00:00
Lin Yuan
5b0617f569
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev
2022-06-02 19:59:26 +00:00
TreeHugger Robot
e6ee0ba1ca
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
am: b2a6f3b640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I38e251a90df0d85b02e4a90e60434374caebb43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 10:56:20 +00:00
TreeHugger Robot
b2a6f3b640
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
am: 2e68c87afc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:40:00 +00:00
TreeHugger Robot
2e68c87afc
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
am: 165c11c0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I8d59841265494fc6b1e1b280c6c275c4103959be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 08:13:52 +00:00
TreeHugger Robot
165c11c0da
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
am: 6fd7cf1993
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I808a8ab16e700325ec93b028e22a58215fbdbbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:58:27 +00:00
TreeHugger Robot
6fd7cf1993
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
am: e3bbadb7df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I6c7835e9885cf02ba167a8f4ac1c564bad511e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:34:09 +00:00
TreeHugger Robot
e3bbadb7df
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 07:15:36 +00:00
TreeHugger Robot
2f184b0ff4
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev
2022-06-02 06:52:53 +00:00
TreeHugger Robot
9d995e75a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-01 23:22:20 +00:00
Lin Yuan
78799a550a
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: https://screenshot.googleplex.com/AqvEW2kTrQT2Ufp
Bug: 228315522
Bug: 228315529
Test: manually on sunfish flashed with rvc.
Change-Id: I6ef64a34764e52de7b461e87ea0af40a6d050587
2022-06-01 07:17:47 -04:00
Lin Yuan
a12fff673b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58
)
2022-06-01 10:53:49 +00:00
Bill Yi
a3d586794b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5c20332cf35d47975bb187aa64db2045acaebd3
2022-06-01 03:47:38 -07:00
Bill Yi
3466df0415
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c0c9eb87ae757d27c2917878e21cb2a7b3bc217
2022-06-01 03:43:59 -07:00
Presubmit Automerger Backend
b7ebd6e3a3
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Bug: 228315522
Bug: 228315529
Change-Id: I8a81fa13e357a7c32a1dde49e0e14fab176ad0fb
2022-06-01 10:37:14 +00:00
Lin Yuan
2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: http://shortn/_EUOdqrOcnS , http://shortn/_j320QDm1Zo
Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device
Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
(cherry picked from commit fcae147f58
)
2022-06-01 10:37:04 +00:00
Lin Yuan
9eff8f7a8d
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
...
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.
screenshots: https://screenshot.googleplex.com/49nR5HQ8g5bgNVq
Bug: 228315522
Bug: 228315529
Test: on device
Change-Id: I92b22567011c32f0874bcecb3898ef678bb549a1
2022-05-31 21:51:40 -04:00
TreeHugger Robot
a39043d1ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-23 18:42:17 +00:00
Bill Yi
0c0b16955b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f6bcb27ceabafc988752c5f988519bc1217f121
2022-05-20 07:21:29 -07:00
Bill Yi
70a7ba0f71
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice7a5337a3736a6fba30fd25ea1adfcdcad9dc75
2022-05-20 07:02:12 -07:00
Bill Yi
0aaa6d1154
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9ec4145b47950134a508ff097af5ecf68d5b19d
2022-05-16 22:10:20 -07:00
Hugh Chen
40ed71c895
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc
am: c2bb599eeb
-s ours am: 8ddd1d70b2
-s ours am: 22ce749aa6
-s ours am: 8ce854af29
-s ours am: 136af4e593
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I9aea03a94b613a948fb141d709a3f59aafc1b047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 21:32:31 +00:00
Hugh Chen
136af4e593
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc
am: c2bb599eeb
-s ours am: 8ddd1d70b2
-s ours am: 22ce749aa6
-s ours am: 8ce854af29
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330693
Change-Id: I6b82d1d82654386eeb76efc977d4dc6abfd7e627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 21:06:42 +00:00