Arc Wang
|
79de331967
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 8d2a48f22f -s ours am: 08df31aab0 -s ours am: b53ed091b3 -s ours am: 88dc583ee4 -s ours am: d578c66eab -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: I62151c87eb2de60c7b827b3d0f606739836769bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:20 +00:00 |
|
Tsung-Mao Fang
|
5a6b8ac4ad
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: fa1c525740 -s ours am: 09f20493a8 -s ours am: 0b28b84745 -s ours am: f44ea8ac2a -s ours am: d3e1af4fbe -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: I5bbbde8b8c2756d9a4fbb1adcb9d3fa74ec293fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:17 +00:00 |
|
Arc Wang
|
1881d88752
|
[automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 am: 8b268b18fe -s ours am: 1834c4bbfe -s ours am: 7fcf96d599 -s ours am: c7bc1cd672 -s ours am: 7330a86029 -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/+/18704659
Change-Id: Iae454c56a04988a0567e01c4fd54c22573e337ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:05 +00:00 |
|
Tsung-Mao Fang
|
e0fda5e180
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 am: 6315e164f7 -s ours am: bf095a51fa -s ours am: 6cb16367a0 -s ours am: b490f37e7c -s ours am: 335b57ff84 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659
Change-Id: I885503ef123becc3ef99b80b303556f41491c772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:03 +00:00 |
|
Arc Wang
|
6f894e1eca
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours am: 82fc149aa7 -s ours am: 8fcadbd219 -s ours am: a5269e6552 -s ours
am skip reason: Merged-In I044b680871472a3c272f6264c4ef272df542112e with SHA-1 67b9fb57ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: I74ba052de6d7d0d1122360620354206006c3539c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:53 +00:00 |
|
Presubmit Automerger Backend
|
b756bb4971
|
[automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea am: 03dd4cc7d2 -s ours am: 719c5bf03e -s ours am: 74c53ed19b -s ours am: 1de9289858 -s ours am: 2f5d55acc6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: I3e5608d22fb94d6949a3bf0cc1e14f916d0d233f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:52 +00:00 |
|
Lin Yuan
|
21758a8275
|
[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: 8d1ed52e6b -s ours am: fc42296e3c -s ours am: 029080e5da -s ours am: 337765a2a8 -s ours am: a6dcacbb88 -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: I202eaafedf5d5a302551d7aa0a035d419a1e8f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:40 +00:00 |
|
Lin Yuan
|
30f4088b8b
|
[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: 263c0cfaca -s ours am: 1911d2fbb4 -s ours am: 5e8d47f7c1 -s ours am: 057708d529 -s ours am: 136f32048f -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: I4d92157acf41ec71b2c2452f668c09c0a20c7f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:39 +00:00 |
|
Lin Yuan
|
6d140ee148
|
[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: 8e637809fd -s ours am: 312065af42 -s ours am: 91a7965763 -s ours am: d618ebd737 -s ours am: 1c0e8bd8d3 -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: I43a670b9468664c28c8ddb9fa834dbdb3c74cdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:24 +00:00 |
|
Lin Yuan
|
830740f789
|
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a am: d78ed7aa73 -s ours am: 36b5a2c8d3 -s ours am: afc61aa166 -s ours am: 86756bbbcc -s ours am: 5a019b3bb2 -s ours am: bd539bfe6d -s ours am: 9377aa495c -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: I80d0055e0cb018f420362806cb80843802930dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:23 +00:00 |
|
Lin Yuan
|
f90ede95ed
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 1e45df2451 -s ours am: 4b9394808a -s ours am: 0af985d835 -s ours am: 1e1a21a6b2 -s ours am: cdd91edd87 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I54464b9faef56ff2e51372f26f44c868a967a79c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:10 +00:00 |
|
Lin Yuan
|
c0144a37c2
|
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a am: b55b5a4d10 am: bdc7a3577c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I519a08ac1edab102c099a2103e3fc2746f60e2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:39:00 +00:00 |
|
Presubmit Automerger Backend
|
b4aeabc3b0
|
[automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -s ours am: 24d50a6c2d -s ours am: a6d96c8c56 -s ours am: 0aa8a3174b -s ours am: 9212e340be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Ib40ffb9da91ff8a4e1b67afc77d18411c0b3ad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:38:59 +00:00 |
|
TreeHugger Robot
|
8a68284882
|
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: 295de2209f am: 4860d558bf am: 9813fb3c89 am: 7bca95eafe am: 330dcf14bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I689147aaada2e02f66bc57d98e6654ea01e65cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:38:47 +00:00 |
|
Automerger Merge Worker
|
ff8b43c8a7
|
Merge changes from topic "am-085dea5a824d4714a317e3fe17b02ff8" into tm-qpr-dev-plus-aosp am: 18c9c68dcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626
Change-Id: I6557fc5e75279f657ddf5d37de09276153ecd500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:36:02 +00:00 |
|
TreeHugger Robot
|
92b12c6eb5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a3be04c95d -s ours am: 3f06f6f6d1 -s ours am: e292a16361 -s ours am: bee605f4c6 -s ours am: f526fdd326 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626
Change-Id: Ib39097e7e2ba91e32d2fd70faf52d2a92e6f36ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:35:47 +00:00 |
|
Bill Yi
|
b04ad26137
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -s ours am: d7c955786d -s ours am: 0039ee096e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983537
Change-Id: I1584951c47a5cd1e26e25427100deffeb552dd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:22:58 +00:00 |
|
Automerger Merge Worker
|
ffa8a9ae44
|
Merge changes from topic "am-2770a49bdf764f0d95dafee4d391aa8d" into tm-qpr-dev-plus-aosp am: 124ffde2c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: I4ae17a496f41556df1b4a886fb1efd335b1cfad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:07:49 +00:00 |
|
TreeHugger Robot
|
9a83822621
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 886b1ed6c2 -s ours am: fc55b18096 -s ours am: 0280f5d5a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856819
Change-Id: I4383f319afd32a8c9d2cdb89a4e671ee9ba26abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:07:37 +00:00 |
|
TreeHugger Robot
|
ac4b96322d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 138ee00007 -s ours am: c5d09db1d6 -s ours am: 2f761920af -s ours am: f51712f8a9 -s ours am: 1bd3faa4d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: Id2e88c1aa6a1b5714c83dd527ca9ee97b9f71ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:04:46 +00:00 |
|
Bill Yi
|
f92e2d01ba
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -s ours am: 78fc5a89a2 -s ours am: 82b1d4bb75 -s ours am: f1bfd6cbab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: Ica540792878c4f3a5ffe05cbdc7ba26f9688c8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:04:37 +00:00 |
|
Bill Yi
|
a5710dbfa8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -s ours am: 8ad79b4bc9 -s ours am: 577514c247 -s ours am: d4aa34d31b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519279
Change-Id: Id8e8b8f95ac0a8eb0486054d2e027e1be7928906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:04:23 +00:00 |
|
Bill Yi
|
2834e598e0
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours am: 7ef26b068f -s ours am: e8196e4539 -s ours am: 743dce6adf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774214
Change-Id: Ic124fc85e662e0955a78948049bca9fb187061b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:42:56 +00:00 |
|
Automerger Merge Worker
|
5ff5fff759
|
Merge changes from topic "am-29d7ad48efcc431899b0bbd26025a146" into tm-qpr-dev-plus-aosp am: fa1dcc31a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: Ief4df62bbf102466355d76e7dd52cee4e8ca28f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:41:14 +00:00 |
|
TreeHugger Robot
|
df6a675e62
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 138ee00007 -s ours am: c5d09db1d6 -s ours am: e48537d1c3 -s ours am: 64d7059c6c -s ours am: 22b5cc924f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: I5271b374639ccc049f14a182622b1dc8a3e1b156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:41:00 +00:00 |
|
TreeHugger Robot
|
a984fb3093
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours am: efd715f248 -s ours am: d9c622001f -s ours am: f833876ecd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364
Change-Id: I28b6290f01ac974f84ee54dd133103531d034517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:32:56 +00:00 |
|
Bill Yi
|
dcbf65cc1a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours am: 92aba93e39 -s ours am: 37695505db -s ours am: 6a9a2643b4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364
Change-Id: Ic3ef31a7d2b35bb47d8a7eadabf37b2f2c1caa5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:32:55 +00:00 |
|
TreeHugger Robot
|
f90bdf34ff
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours am: f8e852db28 -s ours am: 4567625969 -s ours am: ad5f34b640 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361
Change-Id: Ib2e61f6876bf6fbdc9a4e347ac119856f35afeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:32:52 +00:00 |
|
Bill Yi
|
db12409cf3
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours am: 76894ab4b7 -s ours am: 82d4c86cc1 -s ours am: b613895c42 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361
Change-Id: I5a6e8b7c64cbc9e737f7259f16e6fd8718082c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:32:44 +00:00 |
|
Raphael Kim
|
fb2197b066
|
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours am: da80f7abf8 -s ours am: 13b6d85e78 -s ours am: 8d66416060 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I7a0f290427fc1047a80fce0d2d5451d5839a1cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:26:09 +00:00 |
|
Bill Yi
|
dec5b55926
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours am: 1da0b28099 -s ours am: 975a453dfc -s ours am: eaab498278 -s ours am: 65763702a1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425265
Change-Id: Iac683db676399148ac2df2d50608b91f8725b868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:04:47 +00:00 |
|
Arc Wang
|
cf08a45b8f
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: a58d975aa0 -s ours am: 5f46cdb737 -s ours am: c47ee0a8c6 -s ours am: 33aeef8364 -s ours am: 0cf9b785c3 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ie2c7bf0299eda38eb712d8918db996bcabc14797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:49 +00:00 |
|
Tsung-Mao Fang
|
34059afe15
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: ecde630b9f -s ours am: 0572826178 -s ours am: 08c707a619 -s ours am: 9a0314ab85 -s ours am: 6b2e20a596 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ib3a4837e6f6a4e7587866bf79420ed0f072d3df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:47 +00:00 |
|
Arc Wang
|
7fd96f5e9e
|
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: e6135eeb89 -s ours am: eb1d86b66b -s ours am: b356e927d8 -s ours am: 2e72d94db7 -s ours am: 3a0b498461 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I7b0db195cc794ddc3a81d0c0db82e90cfb7dea90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:45 +00:00 |
|
Arc Wang
|
b18326cf6d
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: e7ecf11a38 -s ours am: f026e9b800 -s ours am: b41c3e65ae -s ours am: 03148145c4 -s ours am: 4510f34b99 -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: Ifba072fa9bd463fc352c5417d672bc70e4f6162f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:27 +00:00 |
|
Tsung-Mao Fang
|
d9bffbf71a
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ab42aa1a96 -s ours am: 6d3f4e10cc -s ours am: 98131b8644 -s ours am: bf4a614864 -s ours am: f49bbc551e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: I09fda5a004f77c560f3e9793cf7422df70c10aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:25 +00:00 |
|
Arc Wang
|
4d44d15572
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 8d2a48f22f -s ours am: 08df31aab0 -s ours am: b53ed091b3 -s ours am: 98dd231188 -s ours am: 8e6e2aa019 -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: I2dcf8c8372ce2d79e319087bd3f662aecc440e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:12 +00:00 |
|
Tsung-Mao Fang
|
d5de928fc2
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: fa1c525740 -s ours am: 09f20493a8 -s ours am: 0b28b84745 -s ours am: db838bf1a6 -s ours am: fec832709a -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: Iac60da1914fa60f6f7618ef3b3cc949173b63946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:53:10 +00:00 |
|
Arc Wang
|
dff5919b2c
|
[automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 am: 8b268b18fe -s ours am: 1834c4bbfe -s ours am: 7fcf96d599 -s ours am: 8618ec09a9 -s ours am: 5fbd6b020e -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/+/18704659
Change-Id: Ia1ea468c5e9f73312abfdf1e8a993cfec2077182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:49 +00:00 |
|
Tsung-Mao Fang
|
72d9522d94
|
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 am: 6315e164f7 -s ours am: bf095a51fa -s ours am: 6cb16367a0 -s ours am: 92a909e948 -s ours am: 05a424d163 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659
Change-Id: I0289d361cb1a3f0f6456fa994665d12899631449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:48 +00:00 |
|
Arc Wang
|
5377a78d2e
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours am: 82fc149aa7 -s ours am: c585fa3f4d -s ours am: 8be4b0fe2d -s ours
am skip reason: Merged-In I044b680871472a3c272f6264c4ef272df542112e with SHA-1 67b9fb57ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: I826ad404691421d325d25ebe1d9f64977d06308f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:34 +00:00 |
|
Presubmit Automerger Backend
|
7afb3c5afc
|
[automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea am: 03dd4cc7d2 -s ours am: 719c5bf03e -s ours am: 74c53ed19b -s ours am: 04a9796b13 -s ours am: 9f3cbd8b6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: I16c55d4d85a9927273c5cf369db91489ef78451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:25 +00:00 |
|
Lin Yuan
|
8b1325ac9b
|
[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: 8d1ed52e6b -s ours am: fc42296e3c -s ours am: 029080e5da -s ours am: 0d13406364 -s ours am: 120786ee01 -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: I5b3a8f0d9c871a7fc532f397307bebd8b00ce689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:06 +00:00 |
|
Lin Yuan
|
20338f53cb
|
[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: 263c0cfaca -s ours am: 1911d2fbb4 -s ours am: 5e8d47f7c1 -s ours am: dca2038eb8 -s ours am: a131f01f7e -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: I0c711e47c06304df39b66960c47d61b988be6558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:52:03 +00:00 |
|
Lin Yuan
|
623e5ed3fa
|
[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: 8e637809fd -s ours am: 312065af42 -s ours am: 91a7965763 -s ours am: c60612b5ac -s ours am: bffbdb1249 -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: Idd58563af33dd93ffd6a3ab009465340771e24de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:49 +00:00 |
|
Lin Yuan
|
8ad51908f5
|
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a am: d78ed7aa73 -s ours am: 36b5a2c8d3 -s ours am: afc61aa166 -s ours am: 86756bbbcc -s ours am: 5a019b3bb2 -s ours am: b18f65a680 -s ours am: 3f23b58bb3 -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: I7e6c513a920a614c9773c036e1d492672e225a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:39 +00:00 |
|
Lin Yuan
|
58aaf02120
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 1e45df2451 -s ours am: 4b9394808a -s ours am: 0af985d835 -s ours am: d015f6258b -s ours am: 54c6d7ed8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Ic8b7e21d9a176f89d6b9d929b85def165ee80cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:27 +00:00 |
|
Lin Yuan
|
d2b0f7849d
|
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a am: 42d32d9c2a am: 99cd6a4089
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I4b2fb5f4af99e8e37a4c828c7f81106a8ac303ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:16 +00:00 |
|
Presubmit Automerger Backend
|
fc82ead18a
|
[automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -s ours am: 24d50a6c2d -s ours am: a6d96c8c56 -s ours am: 0202695dfb -s ours am: bfc9515553 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I259e77c5f63f72150585f2cab5e74aaeba8223d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:14 +00:00 |
|
TreeHugger Robot
|
57fd25f4d1
|
Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc am: 295de2209f am: 4860d558bf am: 9813fb3c89 am: 7aff113fa2 am: 8f8106ab64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I7d94a402edf71a456fe3448de1d373961b00f56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:51:01 +00:00 |
|