PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,442 Commits 1 Branch 0 Tags
c9b2ead7126f9ba4e636f82ae17de5809dc08d4c
Commit Graph

110442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
628068265b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: d032393702 -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: I217301729fcf25bd4575e0454add345acf6e11c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:48 +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
8302f5fa9d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: f3067d00ac -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: I9ee07127aa3955ce5def34a3518d58c66f0bfc65
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
Bill Yi
75442bdb74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 830c1d7b09 -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: I651a2db2f184d3db6b3c68c6d9ee4b6cac45205d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:26 +00:00
Bill Yi
335f8e6652 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 280da2a5b3 -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: Id29e52be2801453d81608771172d9a93a7681b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:11 +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
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
d032393702 [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: I252b1f6ee02bcf882e04988e19d3abbc7df2b17f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:48 +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
f3067d00ac [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: I239703f89e7375bf8e907c8925482d900769bc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:40 +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
830c1d7b09 [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: I5d02b08cbb1f10a7f186229216cd7608c91e4888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:26 +00:00
Bill Yi
280da2a5b3 [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: Idaf022f156122fe40320b83f230257f19552bde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:15 +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
Avinash Vadlamudi
1b7e411315 Rename method for better readability 
- Rename encircle to encircleUserIcon for proper readability

Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
 2022-06-03 10:22:31 +00: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
  Import translations. DO NOT MERGE ANYWHERE
 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
  Import translations. DO NOT MERGE ANYWHERE
 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