Lin Yuan
|
0789b60507
|
[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: 539565473e -s ours am: d13cc2bdc6 -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: Iff1793322d315f5de5aa6719e2c9bfbe516dabc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:40:22 +00:00 |
|
Lin Yuan
|
4b3277a460
|
[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: a4ef44afa5 -s ours am: 5418d3bf62 -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: Icac4ecd8aa20786c85ad83fc1840a6658e7439c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:40:21 +00:00 |
|
Lin Yuan
|
5decb8008b
|
[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: aa303bf841 -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: Iaa8fdb7f99a4339a7565a9de5b835331fd91f2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:21:15 +00:00 |
|
Lin Yuan
|
b93146c5c6
|
[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: c39beae5d0 -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: I13744e84ed64d9a0421726aa0c2ff3b7174b8928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:21:14 +00:00 |
|
Lin Yuan
|
93ab443f81
|
[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: b3f42ca856 -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: Ide37275d8988b6c77a77d6bac0b0afceb41af04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:20:47 +00:00 |
|
Lin Yuan
|
8cbf758a3f
|
[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: 4c82cadaf7 -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: Id2fdbdd081a0623e165bcf651f3db4d00954acfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:20:46 +00:00 |
|
Lin Yuan
|
d13cc2bdc6
|
[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: 539565473e -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: I9872cb3f3fa877ac6afaf1359c986f7acc50e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:20:34 +00:00 |
|
Lin Yuan
|
5418d3bf62
|
[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: a4ef44afa5 -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: I43beb94b57be7fff899b12deb3be93d02117f0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 23:20:32 +00:00 |
|
Automerger Merge Worker
|
eb167e282b
|
Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp am: 933f3a97e7 am: 43163784b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I1e13829630b9f4c4e19423a68c4ce4bfdadddb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:52:22 +00:00 |
|
Lin Yuan
|
26e4c9c01f
|
[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: e4afecdfbb -s ours am: b7c00690b9 -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: I0efad95111ce99f0bf87adfc913ba55fa5a2de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:52:21 +00:00 |
|
Lin Yuan
|
14d0f2ba9c
|
[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: 8aa0045582 -s ours am: 57fda70588 -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: I86fd3cd7b26b91ab8780fca2df8d95671f31c265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:51:46 +00:00 |
|
Lin Yuan
|
def1db89c1
|
[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: 24e9395014 -s ours am: 9ed61a56fb -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: Ib870e03b54fa791fdbf6fc893909b7dd0aa35316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:51:43 +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
|
0acf211c77
|
[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: baafc1c083 -s ours am: a14e842cce -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: If35aec45d569d97364a8b7f6ea7ee2e6436cc487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:55 +00:00 |
|
Lin Yuan
|
d932dfe5cf
|
[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: 569fa44ce1 -s ours am: f436430c26 -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: Ibd16b13344e969199f922d4dfa2dc46335e46e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:53 +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
|
539565473e
|
[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: I55da50eb51e5e231b1c71c53c657079675e5ea7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:42 +00:00 |
|
Lin Yuan
|
a4ef44afa5
|
[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: I41907d6719529d3b9f9f42a6484a0e0cb925491b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:41 +00:00 |
|
Lin Yuan
|
eb474f231a
|
[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: 58b399ea96 -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: I642a9ba8b99916e808aa47d732ad3ede33e5b1e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:40 +00:00 |
|
Lin Yuan
|
1b6b2c5907
|
[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: e59cfdf995 -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: Ic5d7c1a08b069364a5f615128e80331d61bd6bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:50:38 +00:00 |
|
Lin Yuan
|
58b399ea96
|
[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: Id3a683eeac21c6f82abcbb6be52f0ea816e2ebf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:34:07 +00:00 |
|
Lin Yuan
|
e59cfdf995
|
[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: Icfea454944a2a5d28e9a83f3e02ffa971053a479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:34:04 +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 |
|
Automerger Merge Worker
|
43163784b1
|
Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp am: 933f3a97e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I431d388da9630a0b8b67720a9c528da33ea87bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:33:39 +00:00 |
|
Lin Yuan
|
b7c00690b9
|
[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: e4afecdfbb -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: Ic33cb968bc037b7693e45e6eb7666dd36d5eba52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:33:38 +00:00 |
|
Lin Yuan
|
57fda70588
|
[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: 8aa0045582 -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: I5e5fe6fc712a26529fad774db567857c7a76a77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:32:56 +00:00 |
|
Lin Yuan
|
9ed61a56fb
|
[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: 24e9395014 -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: I04e405130d6d231203bf4965ded92215f9dfdffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:32:55 +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 |
|
Lin Yuan
|
a14e842cce
|
[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: baafc1c083 -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: Iaea15aa93d4b1627cb71c6691748515e88433155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:32:30 +00:00 |
|
Lin Yuan
|
f436430c26
|
[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: 569fa44ce1 -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: Iab263432a0497ed12222f59b09647c80840d3a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:32:27 +00:00 |
|
Bill Yi
|
acdfd2bb00
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0f02336db9
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719927
Change-Id: I93387991e59fd8109a9761a21175a75c95696c5e
|
2022-06-02 22:21:07 +00:00 |
|
Bill Yi
|
592d137ea9
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d17d7191
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719926
Change-Id: I4f1c1e653ebf175762e7ce9da9da67cdf662475a
|
2022-06-02 22:20:45 +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
|
baafc1c083
|
[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: I44ea64f220fd059511e575f5df2cc8e9319bacf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:16:25 +00:00 |
|
Lin Yuan
|
569fa44ce1
|
[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: Ie3462cafef0d79bf6ae1f98c8638b916ca662e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:16:23 +00:00 |
|
Lin Yuan
|
18ef7b19c1
|
[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: 7010369228 -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: I0ca6fa77b8a02077bb55bcef7216fd904a5ecc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:16:05 +00:00 |
|
Lin Yuan
|
7d0447da80
|
[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: 3f21d49928 -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: Ic3c8350353f10911114ce3e8f13c2fab77fd7a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-02 22:16:04 +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
|
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
|
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 |
|