Alice Kuo
b13abc03dd
Unify the LE audio string and refine the layout to put LE audio switch together
...
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
2022-06-03 11:52:50 +08:00
TreeHugger Robot
07d441af15
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 47b9da9788 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719927
Change-Id: I85590a16d6a98c9df13b45a1bcab3ebf34d92a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 03:38:38 +00:00
TreeHugger Robot
37c15b599a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3e66a3d50b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18719926
Change-Id: I3c70ea2397b19e06e6db8e2374efbed0099353e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 03:35:44 +00:00
TreeHugger Robot
47b9da9788
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-03 03:08:13 +00:00
TreeHugger Robot
2d86c899a2
Merge changes from topic "tc_change_22060215_2"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0f02336db9
2022-06-03 03:08:13 +00:00
TreeHugger Robot
3e66a3d50b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-03 03:08:13 +00:00
TreeHugger Robot
1a7066aff7
Merge changes from topic "tc_change_22060215_2"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c9d17d7191
2022-06-03 03:08:13 +00:00
Avinash Vadlamudi
618fd19f28
Merge "Fix the Ephemeral guest mode UI bugs"
2022-06-03 02:44:34 +00:00
Lin Yuan
628a74d3cc
[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: 5decb8008b -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: Ifda760306bcd5a664188a2dc86460a781739c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 23:41:17 +00:00
Lin Yuan
8c2da28b35
[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: b93146c5c6 -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: I66e211f41c38a5c2eaeeecc3cb27940cc8d480ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 23:41:15 +00:00
Lin Yuan
9f7bc079aa
[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: 93ab443f81 -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: I9a02cea10e1ab6f4a5301946010442df73c589bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 23:40:52 +00:00
Lin Yuan
0cfcfc418a
[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: 8cbf758a3f -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: I3f56853724c74226d8d094ed3ead0c9f580bbccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 23:40:51 +00:00
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: 3a95e552c695d21bc12f18c00007b7148b2d99bafd627f9c1d729c5d0487f59cba01c278799a550ad78ed7aa7336b5a2c8d39a8b9356d198c2b7b85d5912455bf04e92ed395b
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
