Automerger Merge Worker
|
fa1dcc31a9
|
Merge changes from topic "am-29d7ad48efcc431899b0bbd26025a146" into tm-qpr-dev-plus-aosp
* changes:
[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
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -s ours am: 3551812a67 -s ours am: d638f16e1d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -s ours am: a91ae9e3b3 -s ours am: c87def004d -s ours
|
2022-06-24 02:02:47 +00:00 |
|
Arc Wang
|
1b6084171c
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: c717665361 -s ours am: 0270951c5e -s ours am: 2648bc1e2b -s ours am: 37f59d9a2f -s ours am: 6cf75edcd1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: I968a2dbb9a4320b81822a68f069d917a6ce011e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:43 +00:00 |
|
Arc Wang
|
23beb9ba8a
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours am: 72709c0ff2 -s ours am: 2719b821af -s ours am: fd7a23b847 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I4c23b5eaf00edd0f92e38a8a5533e97c8a39d6b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:33 +00:00 |
|
TreeHugger Robot
|
22b5cc924f
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: I39bda4f1c1ffb38b36a7742f70a0526b9f59b7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:31 +00:00 |
|
Arc Wang
|
fc73e4ca2b
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours am: 6e4023a414 -s ours am: 28b68dbbd6 -s ours am: 37372b3fbe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: I5d976d3abe658efcf63bda732ff10a367c5813fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:23 +00:00 |
|
Bill Yi
|
5110966c6e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -s ours am: 3551812a67 -s ours am: d638f16e1d -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: I8188f08297fbe0390d4f1df041d3947d61275d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:21 +00:00 |
|
Arc Wang
|
f9c7205875
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours am: 2f6114e8ee -s ours am: 1ed4ab4477 -s ours am: 6cb1970cdb -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I4250a69b88fbb123900024606772e28fbb4b8602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:12 +00:00 |
|
Bill Yi
|
0fbf7e3878
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -s ours am: a91ae9e3b3 -s ours am: c87def004d -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: Iaf3df835591572ddb60ba09ebfef0247caac4e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:02:10 +00:00 |
|
TreeHugger Robot
|
f833876ecd
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364
Change-Id: Ic9058c0841ca7e3401063e9db423283d5830fdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:01:11 +00:00 |
|
Bill Yi
|
6a9a2643b4
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745364
Change-Id: I41b9ebed73d80d626d9cfb8b672a99fc052177ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:01:10 +00:00 |
|
TreeHugger Robot
|
ad5f34b640
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361
Change-Id: I88f81842bb8d1f874c45f53d97be207c74d3e778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:01:06 +00:00 |
|
Bill Yi
|
b613895c42
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745361
Change-Id: I4dd2862fbe04ebfa0739dd382375d1e5cdea847f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:01:01 +00:00 |
|
Raphael Kim
|
8d66416060
|
[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 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: I8ff162acb3c2c093a10261837d1fee40b8465674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:58:32 +00:00 |
|
Bill Yi
|
5bc07445cc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: 2eae4ac4de -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: If68478f93da17a63e9bacbfd7df33315de1ddd4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:58:25 +00:00 |
|
Bill Yi
|
65763702a1
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425265
Change-Id: I77d598a3c4a69f70aa43b44dd1ee9ceb734d17f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:55:20 +00:00 |
|
Arc Wang
|
0cf9b785c3
|
[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 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: I625a8f4ade7d31e711eb55d8803e50325ebd39d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:55:07 +00:00 |
|
Tsung-Mao Fang
|
6b2e20a596
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ic9fb44abb30564cb88b94407b3ebd2e653ccc8f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:55:06 +00:00 |
|
Arc Wang
|
3a0b498461
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I64ba20ad967d08243612457599b2ebad5af7a7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:55:05 +00:00 |
|
Arc Wang
|
4510f34b99
|
[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 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: I8f6141877d6a98671f3d760388d22fffbc840900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:49 +00:00 |
|
Tsung-Mao Fang
|
f49bbc551e
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: I37709fe7360f1990dbed509db39e287016d9b7e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:47 +00:00 |
|
TreeHugger Robot
|
b54eb125ce
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours am: 0d3449e115 -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: Ia18435692ea10bbdbdb9d1ce4ba4f1946e532f9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:46 +00:00 |
|
Arc Wang
|
8e6e2aa019
|
[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 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: I53acd8cd414b0313cb59a050f8e9ee7d14de8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:36 +00:00 |
|
Tsung-Mao Fang
|
fec832709a
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661
Change-Id: I9fed3bbb872cbfb625efad53a99b21fd74360d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:35 +00:00 |
|
Bill Yi
|
bd7cc5f20a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours am: 2a83f7e670 -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: I8fe48fbabd38ae1e7ed751f2e4c537d7699a9bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:34 +00:00 |
|
Arc Wang
|
5fbd6b020e
|
[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 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: Ief53408b02dd7e2cc691ca5a00851dfc77f5a051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:26 +00:00 |
|
Bill Yi
|
9d0f56c740
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours am: fb9d9a9d78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18856818
Change-Id: I077187312a2e78567dbeba59a99629e6a83d3da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:26 +00:00 |
|
Tsung-Mao Fang
|
05a424d163
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659
Change-Id: Ib09e05d34ef3b6888d163f19e8d41def70221344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:24 +00:00 |
|
Arc Wang
|
8be4b0fe2d
|
[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 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: I4431136568318ebf0d83acde5abc03791cae9f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:06 +00:00 |
|
Presubmit Automerger Backend
|
9f3cbd8b6f
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: Ie99348b9a5d7e5809ebfdab70df344b39c0dc30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:54:02 +00:00 |
|
Lin Yuan
|
120786ee01
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5d0db6fa742c13df668ef2473eb832cb5b61effe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:53 +00:00 |
|
Lin Yuan
|
a131f01f7e
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: Iadcefe9ce3c5d7162e3329df8750dd30f9abdc9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:47 +00:00 |
|
Lin Yuan
|
bffbdb1249
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: Idc48308018bb75ff7e11908cb53aa2934956e94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:34 +00:00 |
|
Lin Yuan
|
3f23b58bb3
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I16df3498b5055e799d88feb7f1546e9221807763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:32 +00:00 |
|
Lin Yuan
|
54c6d7ed8a
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I0620bec6d64774dbe2ee2db040a7386ebe52d817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:23 +00:00 |
|
Lin Yuan
|
99cd6a4089
|
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a am: 42d32d9c2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: If5239701bb181a1da03102ef7047afee45633a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:15 +00:00 |
|
Presubmit Automerger Backend
|
bfc9515553
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I638cf931aec7078fc40d594e32d37aec041022d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:14 +00:00 |
|
TreeHugger Robot
|
8f8106ab64
|
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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: Ib7e39537d2ad7b8d2dbf6cbd0dd10a35f5a568f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:53:05 +00:00 |
|
Bill Yi
|
d7c955786d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours am: fcf5908f6e -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: I781041fbff5a1e1ba47e8671c88dd49231616c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:52:13 +00:00 |
|
Automerger Merge Worker
|
b8b85a37d9
|
Merge changes from topic "am-3146178bac854f5b94fd0778f6f8945f" into tm-d1-dev-plus-aosp am: d7c8c56ebc am: 87d2de4b83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I590b48e4b9cbadba325b5f78339976e1993fcfdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:31 +00:00 |
|
TreeHugger Robot
|
a14bd57243
|
[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: e7d52b4350 -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: I50b225fc3894636aa68ccd9dd53c019ad606a17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:30 +00:00 |
|
Bill Yi
|
1fd98c9935
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: f05a1e9f76 -s ours am: e35d73c198 -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: I27b0c29acb0db374a2513faffc120f28cbac5161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:27 +00:00 |
|
TreeHugger Robot
|
485b5d43ed
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -s ours am: 7aef2a082f -s ours am: 0234692bc7 -s ours am: 63e6599c52 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I3604ac06a7d96f4e8729131a4f28aa3d113ab205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:26 +00:00 |
|
Bill Yi
|
2eae4ac4de
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -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: Icca306db2488f8038964252ee7d1b91b9b1a01a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:12 +00:00 |
|
Bill Yi
|
5e1c6d6512
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: dd5dd0af82 -s ours am: 26b3bb64ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18692579
Change-Id: I4471a345bec09f74375415ec8876c5e921eb30bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:04 +00:00 |
|
Arc Wang
|
c843f15d2e
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: c717665361 -s ours am: 0270951c5e -s ours am: 464acaa669 -s ours am: b4282f2c3f -s ours am: b53eeee895 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Ia05043815605623e337d713c80570e732261a32c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:51:01 +00:00 |
|
Arc Wang
|
44f19141a7
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551 -s ours am: d47388ce79 -s ours am: 5f01cd3e3f -s ours am: 7dd3084f1a -s ours am: ac35d1fba1 -s ours am: 4594cc7e8e -s ours am: 448360cf7b -s ours am: b806ec2472 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I5a46fc0a1c105d6a204d64e95461275f15f4359d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:51 +00:00 |
|
Arc Wang
|
e3f1f4da08
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: a13b99e496 -s ours am: 56094f5a5e -s ours am: 643b9bde10 -s ours am: 733d7ff53a -s ours am: f65e971163 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: If88089412029297d6155273d05b42785515c1f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:37 +00:00 |
|
Arc Wang
|
7e1414bb29
|
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -s ours am: fc6f460183 -s ours am: 84b1d091b8 -s ours am: 8689db777c -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: I6b3f6397780dc578cbbbd20c4035f87cdff94fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:30 +00:00 |
|
Arc Wang
|
103be9397e
|
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: c717665361 -s ours am: 0270951c5e -s ours am: 464acaa669 -s ours am: 73ad9454e8 -s ours am: 107b624d36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Ia27c6048ba378f6b4c6c8575271da122f336e85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:50:18 +00:00 |
|
Automerger Merge Worker
|
3ea6dc01f8
|
Merge changes from topic "am-fff65bf311764194ac266fe45e89521f" into tm-qpr-dev-plus-aosp
* changes:
[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: 3e3c6aea88 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -s ours am: 3551812a67 -s ours am: e973071b5b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -s ours am: a91ae9e3b3 -s ours am: e9f0f0cc3c -s ours
|
2022-06-24 01:48:39 +00:00 |
|