Automerger Merge Worker
|
793c4cf445
|
Merge changes from topic "am-99a4f1e9b37341c68410eecb699d0497" into tm-d1-dev-plus-aosp
* changes:
[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
[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
[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
|
2022-06-24 01:19:31 +00:00 |
|
Automerger Merge Worker
|
70d0cae4c6
|
Merge changes from topic "am-7239d99af3b94ed6b17b0eb5e4bbdb3c" into tm-d1-dev-plus-aosp
* changes:
[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
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: 4117258977 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: f1f15ba317 -s ours
|
2022-06-24 01:19:25 +00:00 |
|
Arc Wang
|
7855ebe551
|
[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 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: I2478b465b4939406128ee58e76daa9d12b3b9fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:19:25 +00:00 |
|
Tsung-Mao Fang
|
c6da54bcf8
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ib37e4c87455fe6fee4b20210ddaa9e3e79a77522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:19:24 +00:00 |
|
Arc Wang
|
02e8249e0b
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I0b8a27fc2a6ddc0a2952a005d20d4e878aee7ebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:19:23 +00:00 |
|
Arc Wang
|
bd429a5a27
|
[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 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: I93284c871015557446720879c2843728e8dfd086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:19:09 +00:00 |
|
Tsung-Mao Fang
|
9b775b63bb
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: I96e731c9e5f3950bd70f8a2a91ea179990d74cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:19:07 +00:00 |
|
Arc Wang
|
88dc583ee4
|
[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 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: I381a4f50b10bcf00f1d36c3542c16293bcfc297d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:56 +00:00 |
|
Tsung-Mao Fang
|
f44ea8ac2a
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661
Change-Id: I35f42737bd871143e902e12e695dfa55370af83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:54 +00:00 |
|
Arc Wang
|
c7bc1cd672
|
[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 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: I067fc98fbf1a3cc79704a327ce12ae1d6467e1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:45 +00:00 |
|
Tsung-Mao Fang
|
b490f37e7c
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659
Change-Id: I1bd56150e4cb1653dca635d47cb8c9176444fdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:44 +00:00 |
|
Arc Wang
|
8fcadbd219
|
[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 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: Idcddd6cf498a3dbf13baecb4cc2aac9bcb5ed1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:36 +00:00 |
|
Presubmit Automerger Backend
|
1de9289858
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356595
Change-Id: I600f63b9f897ce68ee03099094e4224f3cde5858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:35 +00:00 |
|
TreeHugger Robot
|
5afaa6dbc4
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626
Change-Id: I12a01a53996a90d9a7bcd88809eb8e95d23ab12d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:29 +00:00 |
|
Lin Yuan
|
337765a2a8
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: Ia8116b966a08ff92abb4707f1cd1d828193aad77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:27 +00:00 |
|
Lin Yuan
|
057708d529
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I6370f0e8ad88eb3a7db2c2944e0f46fc299c5a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:25 +00:00 |
|
Bill Yi
|
5499edad45
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: 4117258977 -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: Idff436fbcc997c6e46d1da50f456480a2706cad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:15 +00:00 |
|
Lin Yuan
|
d618ebd737
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: Iedea7c2d56cbac90678e0a3021225cde114e132a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:12 +00:00 |
|
Lin Yuan
|
bd539bfe6d
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: Ic80c99285da2b78841dce28f4833fe2ad56b4657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:11 +00:00 |
|
Bill Yi
|
dacc40cd96
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: f1f15ba317 -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: Ie99eb2ff4aab2e2b1598675df315ab83e3cd5650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:03 +00:00 |
|
Lin Yuan
|
1e1a21a6b2
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I3dce0ef1a10eeb79e9de8ce9ac0770d84649e524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:18:02 +00:00 |
|
Lin Yuan
|
b55b5a4d10
|
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd am: 06c8e2472a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: Ica22bb6623a983ce5e89dc8c45639272f654803b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:17:55 +00:00 |
|
Presubmit Automerger Backend
|
0aa8a3174b
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I96df83675154ed8e0070433960f4f5ab0acbf753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:17:54 +00:00 |
|
TreeHugger Robot
|
7bca95eafe
|
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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869
Change-Id: I75cd4118e5d8eefcb87ac9a0c886c6b79c26216b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:17:35 +00:00 |
|
Automerger Merge Worker
|
fc9724a1bb
|
Merge changes from topic "am-28212c0c6de44616b530d551080b64df" into tm-d1-dev-plus-aosp
* changes:
[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
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: f05a1e9f76 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: dd5dd0af82 -s ours
|
2022-06-24 01:17:20 +00:00 |
|
TreeHugger Robot
|
bee605f4c6
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693626
Change-Id: Ief594e301bd72eaf3a5427aa70ac0047f77278d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:16:15 +00:00 |
|
Bill Yi
|
47da1a41b7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -s ours am: 4dbeddd095 -s ours am: f05a1e9f76 -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: I3f27a84a9243b9dc69c0039cb020af5389872328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:16:02 +00:00 |
|
Bill Yi
|
48cbf9d215
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -s ours am: d839af3be9 -s ours am: dd5dd0af82 -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: I46fc920a7dfaf9036003d68bf53c333c9cdb941c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:52 +00:00 |
|
TreeHugger Robot
|
efd715f248
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -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: Ie2917446b4340d201528b209c81c6c3f0adf645e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:29 +00:00 |
|
Bill Yi
|
92aba93e39
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -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: Ic125eee7bda03257b5b87ffc96461df31549fc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:26 +00:00 |
|
TreeHugger Robot
|
f8e852db28
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -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: I354b2df7f8084dacefd5a8e1c8f6d3f61a447377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:21 +00:00 |
|
Bill Yi
|
76894ab4b7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -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: Ib0e40c826570c2ca3e93c8b41d298066b10f73e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:16 +00:00 |
|
TreeHugger Robot
|
f51712f8a9
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519782
Change-Id: I69cd04972405cc529841bbc94174ccd161ddc5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:15:06 +00:00 |
|
Bill Yi
|
82b1d4bb75
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -s ours am: 78fc5a89a2 -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: Iefa9b07a20cbd687492677cc51b67eb081ea4317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:14:55 +00:00 |
|
Bill Yi
|
577514c247
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -s ours am: 8ad79b4bc9 -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: Iff70df36d3df0903ef0646dc31bc8969fa3b3b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:14:46 +00:00 |
|
Bill Yi
|
4fcc193a8b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -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: Iaedf643640450877cb8781bfea1ff15983af08db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:14:20 +00:00 |
|
TreeHugger Robot
|
975270c942
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -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: I5add9401cf7e0ab70f70306bed8f2a2c0fb4b32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:13:38 +00:00 |
|
Bill Yi
|
9eba6b6755
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -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: I22bbda51a450224ac33de486378a7fd5be2bfd2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:13:36 +00:00 |
|
TreeHugger Robot
|
3116a23082
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -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: I02ad04904910de49692a7235dd35c0bf7040c4e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:13:29 +00:00 |
|
Bill Yi
|
1a6e2f7f6f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -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: I28579be776c1c68cd5c84df5e6de331b75511a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:13:26 +00:00 |
|
Raphael Kim
|
da80f7abf8
|
[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 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: I8b227f98111464b5884f5707ba39274f3e06eeb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:10:40 +00:00 |
|
Arc Wang
|
c47ee0a8c6
|
[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 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: I7d3984cce21b5dd48da2f0b11a8e620a8b7a3cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:10:11 +00:00 |
|
Tsung-Mao Fang
|
08c707a619
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I58f6f04cead1a9d627c5a1504d639a4d123e59c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:10:10 +00:00 |
|
Arc Wang
|
b356e927d8
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I65536a8d3002a3945fce0abdea47f3f3a5859be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:10:09 +00:00 |
|
Raphael Kim
|
f338527c54
|
[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 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: I7f5cdf0c00c5aefe38887ddc93a3221a403019c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:10:02 +00:00 |
|
Arc Wang
|
b41c3e65ae
|
[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 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: I97606e371556623b98132658ffdccc6f693e4773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:09:58 +00:00 |
|
Tsung-Mao Fang
|
98131b8644
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704662
Change-Id: If02a479645048b4ba704d22a87f98417472aaa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:09:57 +00:00 |
|
Arc Wang
|
b53ed091b3
|
[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 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: I8f26057c4abe6c3bbd5d4f5fe75bd08070241f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:09:49 +00:00 |
|
Tsung-Mao Fang
|
0b28b84745
|
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704661
Change-Id: I481c6cda846946e6ae48524de3bd6b49a9cea22b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:09:48 +00:00 |
|
Arc Wang
|
7fcf96d599
|
[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 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: I3d196f63cb801823c97696f9fc98b82c3c1a5bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 01:09:40 +00:00 |
|