Raphael Kim
b8c14b8752
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67
-s ours am: ff7f705e3e
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647
Change-Id: I12b9d85398e088f62cff4f0423b5de053751c736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:19:59 +00:00
Arc Wang
db800e96b9
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660
Change-Id: Icfeee8189c8284f1f7daea85d4d58d35f55cad32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:19:59 +00:00
Tsung-Mao Fang
00cdaa2259
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0e5c208a4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660
Change-Id: I0e5e408b38d91db502fa6c35a3d937b3a23e64bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:19:58 +00:00
Raphael Kim
f11acd30cf
[automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5
-s ours am: e4a98fbbb7
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647
Change-Id: I65aa5194249aa626926e2d9b77d64ce244b4970d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:19:55 +00:00
Raphael Kim
ff7f705e3e
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev am: 14a63dbf67
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647
Change-Id: I430522ee976449cdcb470e6a510985b8c3732495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:43 +00:00
Raphael Kim
e4a98fbbb7
[automerger skipped] Extract app label from component name in notification access confirmation UI am: c548f102e5
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 ff34195604
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18672647
Change-Id: Id56f80e2f6003aa084ce9c8607fada6cfbe72a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:40 +00:00
Arc Wang
b9ccfd6534
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: I30b7a6be2715493a516157ae181ff46c2f0f4946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:11 +00:00
Tsung-Mao Fang
797861776d
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: I1cc602c563e1e2d7a118551b1fceb0dfa30a646b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:08 +00:00
Arc Wang
3e93b4e4fc
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661
Change-Id: I5896853422386124cf9e88bb85699410f776a1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:06 +00:00
Tsung-Mao Fang
709a5df6f3
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661
Change-Id: I7a0f53768055d1b5350d91fc3c53203caacdd5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:18:02 +00:00
Automerger Merge Worker
2530ab9f18
Merge changes from topic "am-58716186f5b942dba5730c9eff837985" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50
-s ours am: 4cfb1ffa90
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c
-s ours am: 95b19ac0a7
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5
-s ours am: 6a72c90cac
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7
-s ours am: 00a68cc896
-s ours
2022-06-04 00:13:00 +00:00
Bill Yi
d2c3ae9589
[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: I4f40b7b7d705ea404754a15b8e4e095f06a55b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:12:15 +00:00
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
785f9c689d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50
-s ours am: a99136a41f
-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: Ib661b99ebe08f17b0a4639f15332bc6cf1ba5b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:12:04 +00:00
Bill Yi
addc1c03f3
[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: Iddfb406f0907729950ee118796da5ca8698eda64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:12:04 +00:00
Bill Yi
038842bd3e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c
-s ours am: 6c8413c9d2
-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: Ib29f5ede5f654fc710cf561dd95859bc40abf323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:11:54 +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
187b9a2630
[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: I7b67bf4fd539f8703edf78ca7f5dbb741a50fd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:11:50 +00:00
Bill Yi
db0f24bb60
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5
-s ours am: 2ae7a0db93
-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: Ifd52eef88231b9f4f3a3336b059d76b3c40f0cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:11:40 +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
ee26947d53
[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: Ib40e6726c039744531f1ae93ba33c59f3c009be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:11:38 +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
131adc8bf7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7
-s ours am: c3d89fb945
-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: I7e56e6595871a7b4e86f10bfab757a2edf46d3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 00:11:26 +00:00
Arc Wang
ca436b7e59
Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:33:36 +00:00
Arc Wang
5eabdc88f0
Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:27:16 +00:00
Arc Wang
481113b6a3
Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:27:07 +00:00
Arc Wang
688ec25ca8
Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:26:56 +00:00
Arc Wang
0ed1190469
Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:25:50 +00:00
Arc Wang
27f9995beb
Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev
...
* changes:
[DO NOT MERGE] Fix can't change notification sound for work profile.
[DO NOT MERGE] Fix Settings crash when setting a null ringtone
2022-06-03 23:25:34 +00:00
Raphael Kim
14a63dbf67
Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev
2022-06-03 22:20:03 +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
a99136a41f
[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: I568ceec5dd64d2437afac39549205fcabefc896e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 18:47:28 +00:00
Bill Yi
6c8413c9d2
[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: If8f1df638638d16b76e7e0a53a12455f54e8f152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 18:47:13 +00:00
Bill Yi
2ae7a0db93
[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: I11ebf35f2daf101e4d8419f4346c587246977339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 18:47:01 +00:00
Bill Yi
c3d89fb945
[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: I0c607c52b6b3f3d420500b4cab9502f6b921bb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-03 18:46:46 +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
Alice Kuo
f71b2ea56e
Grey out LE audio offload switcher as LE audio isn't enabled/supported
...
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr
Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
2022-06-03 11:53:33 +08:00
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
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
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