Arc Wang
|
995433a9db
|
[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: fcbf0ac60b -s ours am: b20064ac60 -s ours am: 419641bd64 -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: I5b2157202369625115715244df6bea39b0c59da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:55 +00:00 |
|
Tsung-Mao Fang
|
04d5add97d
|
[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: 24ecd6a649 -s ours am: d129fe931a -s ours am: ef96bfb712 -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: I2fe47b010d4d21586983eeaf41c74cddd0be1035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:53 +00:00 |
|
Arc Wang
|
cabf2c2683
|
[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: 9f25b6ebb2 -s ours am: 0526a4df0b -s ours am: 9a6a062ec1 -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: Id704456d9eec3efab4f848885e0d8f1ad6fa1fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:52 +00:00 |
|
Arc Wang
|
f242214e67
|
[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: d9190b2809 -s ours am: 6cf822d742 -s ours am: 52e74f7d03 -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: Ifd311f2e1348144c570a44b22f47fe1127e724f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:34 +00:00 |
|
Tsung-Mao Fang
|
33932b392f
|
[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: 41d96347fb -s ours am: 20670bcbbc -s ours am: bba0d0eef4 -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: Iecb7b1d1f60981ba906421d3e691b2176b0f7c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:33 +00:00 |
|
Arc Wang
|
287a5f7291
|
[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: 4b4bc70165 -s ours am: c37277b18a -s ours am: 23d6fb17ea -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: I4ddd4947cfbfc57e72d77f5ba41310412b272de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:19 +00:00 |
|
Tsung-Mao Fang
|
0839813559
|
[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: 3eb6af7f2d -s ours am: aab2825b80 -s ours am: bb6a76340a -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: I5e8630b0a63ae7484cbc71bf17cee4744bf7abe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:18 +00:00 |
|
Arc Wang
|
44ad9b1cf0
|
[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: fa096d03a8 -s ours am: 7dcb61ea53 -s ours am: 5ad1f27167 -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: Ie204a8245a671152e0168749d98ca2fc51e2ab5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:06 +00:00 |
|
Tsung-Mao Fang
|
0cd993ba53
|
[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: 88d41c143d -s ours am: 5ddb8f4593 -s ours am: fce46f3c22 -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: Ie7fcc19bee65c34f9aa5c25bca421739493cb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:49:05 +00:00 |
|
Arc Wang
|
5a53b92232
|
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours am: 296df76b36 -s ours am: 571d0de3de -s ours am: 81f3f7666f -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: I8ef5943f6420e304c047726e88b273a9474c4042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:52 +00:00 |
|
Presubmit Automerger Backend
|
fb1be6b9e8
|
[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: 73f28b3dae -s ours am: 84864f8493 -s ours am: 6af0f587f0 -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: Ia78b3e9db0ae42b28e3ef31191e75fa73d0790d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:45 +00:00 |
|
Lin Yuan
|
17a038430a
|
[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: bbb27f892b -s ours am: 9348600d50 -s ours am: e8247c35a4 -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: I1674bc0e1e5d62d7cd855c3ac3dfd0164fcd40d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:32 +00:00 |
|
Lin Yuan
|
54e0790674
|
[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: e86a69a3cc -s ours am: 1126db5f91 -s ours am: b98d8bc6a4 -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: I59b133a2114224e8746b19445041904783622305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:30 +00:00 |
|
Lin Yuan
|
8ada18c97c
|
[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: 6ccbbd7dba -s ours am: 0106bd1603 -s ours am: c4440f5544 -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: I206118d54f0351b571e5c59adf0b5de86f28bc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:10 +00:00 |
|
Lin Yuan
|
3d5f5e5fbd
|
[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: 7379f86f26 -s ours am: f9fcf7d68d -s ours am: 32421ad453 -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: Ib1705b7cb6f559055bda93ab6bff74263f4c0cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:48:08 +00:00 |
|
Lin Yuan
|
331fea02e2
|
[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: fb56a11044 -s ours am: f91bdf0c27 -s ours am: c5df73c33d -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: Iea99a8783c60efaa65719fdbf477f150246b272a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:57 +00:00 |
|
Lin Yuan
|
8c66aa7571
|
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 2bae1371a6 am: 29f8ae8411 am: 45d61c61f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I27e647f94ea2657ee652dfa380b8d1b8e25aa3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:47 +00:00 |
|
Presubmit Automerger Backend
|
535b7edaed
|
[automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -s ours am: 24d50a6c2d -s ours am: 4803e01432 -s ours am: a8640e641e -s ours am: 7dd10d9ca2 -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: I67a0fed2f8c003ec9c75769bb5aab8802e19490b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:46 +00:00 |
|
TreeHugger Robot
|
17a74aeece
|
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: 5007d6c563 am: a837c461d2 am: 4e563a3b94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I88f3e844b3feb691c83217571bd98f0d52d6b28b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:35 +00:00 |
|
Automerger Merge Worker
|
1d1080c532
|
[automerger skipped] Merge changes from topic "am-99a4f1e9b37341c68410eecb699d0497" into tm-d1-dev-plus-aosp am: 793c4cf445 -s ours am: fa17c995bd -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/+/18704664
Change-Id: I1170179839e6b90a3bdee41352a5668ac260e270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:20 +00:00 |
|
Arc Wang
|
963f3abc7f
|
[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: 7855ebe551 -s ours am: a3a7a9657a -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: I9238c57aa8c6384dcdc6687de56383da0ebce340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:47:19 +00:00 |
|
Automerger Merge Worker
|
2722075a4a
|
Merge changes from topic "am-7239d99af3b94ed6b17b0eb5e4bbdb3c" into tm-d1-dev-plus-aosp am: 70d0cae4c6 am: a4a7b60f29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626
Change-Id: I1e57b92b592c1804100b1e109cd62d9df375a625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:41:50 +00:00 |
|
TreeHugger Robot
|
d2a0feeb14
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a3be04c95d -s ours am: 3f06f6f6d1 -s ours am: 0309329683 -s ours am: 5afaa6dbc4 -s ours am: 9d90557e27 -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: I66dc58ccec33d7b0ab81cf3a6c7117799c51cd10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:41:39 +00:00 |
|
Arc Wang
|
c9d6109ead
|
[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: bd429a5a27 -s ours am: 15580fc0fb -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: If8045903d4580796b474ca8b43d1a67db8750cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:34 +00:00 |
|
Tsung-Mao Fang
|
b06b3f8694
|
[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: 9b775b63bb -s ours am: 83796117fe -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: I7a0541241de284ec56942ecb9a31e88d7cfe4ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 05:40:33 +00:00 |
|
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 |
|
Evan Chen
|
fc86787927
|
Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev am: bd2b5e7bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18744660
Change-Id: I45cdf05096add05a6702a703fc9287f0237bb8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 04:52:37 +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 |
|