Commit Graph

104483 Commits

Author SHA1 Message Date
Bill Yi
dd8c6768fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie56d8fa2b401f6a8264a029a0b1e07082e10e100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:12:04 +00:00
Bill Yi
a4f418e952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8035fb614c21257d0bb47cc92f6821d06434194d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:54 +00:00
Bill Yi
d9c0deb0b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85c3e28397146be8cef1a038a8839f4ca2a3406e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:39 +00:00
Bill Yi
ba8ad5e3af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied0d66866aca1d2f4938b0f7960e1d4dcdc5a602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:11:28 +00:00
Bill Yi
4cfb1ffa90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc23d1f792e657187589de3fba403533fa420906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:48:20 +00:00
Bill Yi
95b19ac0a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f5afba53003126a77759608733ef880c9aab6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:48:06 +00:00
Bill Yi
6a72c90cac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee867683389a1ac7769863880bd59c18c4a4ee00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:47:53 +00:00
Bill Yi
00a68cc896 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a92bd9f7023ed10cfffa03bc32e11af66ee14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:47:42 +00:00
Bill Yi
71c19fea50 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Bill Yi
1217038cc5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Lin Yuan
aa303bf841 [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: 15e4092ab1 -s ours am: e3448236fb -s ours am: 791bb4e948 -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: Ic64c245c5d4b46d56723913f78e460e9705cc798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:51:04 +00:00
Lin Yuan
c39beae5d0 [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: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -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: Iaf23692a24d4cc273296e8fc564cb14d32fcef49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:51:03 +00:00
Lin Yuan
b3f42ca856 [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: 15e4092ab1 -s ours am: e3448236fb -s ours am: d2b4eb16df -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: I2e2726bfbe468b9304744ec04cff04d5d5de655e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:50:46 +00:00
Lin Yuan
4c82cadaf7 [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: 2667882654 -s ours am: e7943d5edc -s ours am: 43a544c77f -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: I9da5bc1a0063278bec254f1821c32222581196b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:50:45 +00:00
Lin Yuan
791bb4e948 [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: 15e4092ab1 -s ours am: e3448236fb -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: Ic12e9da7b56b99815fbb0dd347be5b5a5816da9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:33:55 +00:00
Lin Yuan
5390d998be [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: 2667882654 -s ours am: e7943d5edc -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: I10e9b3ce43e36a5e2d2997585b41b86ddb388899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:33:54 +00:00
Lin Yuan
d2b4eb16df [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: 15e4092ab1 -s ours am: e3448236fb -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: I08775e580c67176d3dd4de08f0806c070a28de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:32:37 +00:00
Lin Yuan
43a544c77f [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: 2667882654 -s ours am: e7943d5edc -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: If2f1589f42b64aa37300c7d75a5adc3badb385c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:32:35 +00:00
Automerger Merge Worker
933f3a97e7 Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp
* changes:
  [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: fd627f9c1d -s ours am: 729c5d0487 -s ours am: f59cba01c2 -s ours
  [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: 98c2b7b85d -s ours am: 5912455bf0 -s ours am: 4e92ed395b -s ours
2022-06-02 22:16:43 +00:00
Lin Yuan
e4afecdfbb [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: fd627f9c1d -s ours am: 729c5d0487 -s ours am: f59cba01c2 -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: Ic1908245fbcc3cfe3f3fa9201d995540da4b08ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:16:39 +00:00
Lin Yuan
518b50abaa [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: 98c2b7b85d -s ours am: 5912455bf0 -s ours am: 4e92ed395b -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: I4024e28c0700a25ae26c67421c478eebd2d07daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:16:38 +00:00
Lin Yuan
8aa0045582 [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: fd627f9c1d -s ours am: 729c5d0487 -s ours am: d299b72b26 -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: I3e4c6edb6a0fc5390a7902a63eed06beacea74b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:16:37 +00:00
Lin Yuan
24e9395014 [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: 98c2b7b85d -s ours am: 5912455bf0 -s ours am: 88d116c4f7 -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: I053de9f7c1c17651b165baf1010bbb37e30256cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:16:36 +00:00
Lin Yuan
e3448236fb [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: 15e4092ab1 -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: I91133ca3aa5db602109ed9226dbf89f4e5deb6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:14:51 +00:00
Lin Yuan
e7943d5edc [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: 2667882654 -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: I4210f34ea4d69d5e3360c657821b9c26aa158908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:14:48 +00:00
Lin Yuan
d299b72b26 [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: fd627f9c1d -s ours am: 729c5d0487 -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: I9dac888619064d294212bfc1ecdead1f3cb87642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:59:23 +00:00
Lin Yuan
88d116c4f7 [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: 98c2b7b85d -s ours am: 5912455bf0 -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: Ibdcc7dff5819591e0fc8c41db2861113c926409f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:59:22 +00:00
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
f59cba01c2 [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: fd627f9c1d -s ours am: 729c5d0487 -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: Icd2a22e5e4f617484ad402204ac993c0a4826d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:58:01 +00:00
Lin Yuan
4e92ed395b [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: 98c2b7b85d -s ours am: 5912455bf0 -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: Ie9a011e523ddcfa8e8ecdd805c220abb7be80b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:57:59 +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
729c5d0487 [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: fd627f9c1d -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: Idc07e5d093123a6d191e554154ac0c61dfa2c9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:40:22 +00:00
Lin Yuan
5912455bf0 [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: 98c2b7b85d -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: I957ce1642f48645719e65572380e18146437c94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:40:18 +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
9ceb8371a6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours am: afa26d328a -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: I7636e79ccfa07e47886f37d9db6369e9a0e30fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:55:00 +00:00
Lin Yuan
4ca497d380 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours am: f4631f9055 -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: I0d4d1335fa6b1e330bb5bb97298b999d145dc1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:47 +00:00
Lin Yuan
d7264d6abd Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I8c2759f9d17fe543dd5ac952adb2858baa412ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:28 +00:00
Presubmit Automerger Backend
9d50162bdf [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -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: I31a1f25cf9115afd643fa1c04ace767fe1ae16cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:27 +00:00
Lin Yuan
270221eabe Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 0b1da12dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ic4f039caf765b06c3bff63ba675f8aada91fd730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:19 +00:00
Presubmit Automerger Backend
b3c196c001 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: f683dd9f9f -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: I78ed6a1b7c2ab76c06e8949ce4e0d6b34afade16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:17 +00:00
Lin Yuan
5af209b2ad [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 2074939b44 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8b65105dd9e647511f07dd32596fd892f4f33ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:06 +00:00