Commit Graph

104795 Commits

Author SHA1 Message Date
Bill Yi
36ddfc8853 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8eda8d180aabb5f47b910e3ec312396fd207e308
2022-06-05 22:17:02 -07:00
Bill Yi
88b4a11c90 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I81fb26845d241e6c415fb5e57c8a96622c01e4bc
2022-06-05 21:57:47 -07:00
Bill Yi
71660567f7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5c968be7dc8df7de1548f9e84940619e2dfa970e
2022-06-05 21:54:11 -07:00
Raphael Kim
d6353487cf Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev 2022-06-05 01:54:28 +00:00
Bill Yi
106e52ca92 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Bill Yi
aa1b476569 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic528a7fd27a359811be598d1b08467ee883e7b1a
2022-06-04 01:05:23 -07:00
Bill Yi
d3dc439a10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
2b6409fe37 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6476c920020034a0b118ca3d73a10860cd178f51
2022-06-04 00:51:40 -07:00
Arc Wang
7501609c49 [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: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -s ours am: e4771d0706 -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: Icd8adf2854213e30f59bfb8cd7b9b1c5223cf703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:21:45 +00:00
Tsung-Mao Fang
561ce068db [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: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -s ours am: 5fd3f89a33 -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: Ib44443a992f9720a398857d75c90d9cf5f1bb1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:21:44 +00:00
Arc Wang
f3f46a1124 [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: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -s ours am: 2a36e2f772 -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: Icb349766f76fe791ce42ef5b45ab66cc50357156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:21:43 +00:00
Arc Wang
cbffafbccc [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: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -s ours am: 9d4fa149ad -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: I2aec1de68959a52b5a0cacf74ec30c991c0ab667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:14:03 +00:00
Tsung-Mao Fang
8ec5a4c42d [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: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -s ours am: a4b007cc8b -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: If8427d2bf98480c3e71a8c2e6dffc101ddc95727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:14:02 +00:00
Arc Wang
b271e9e37f [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: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -s ours am: 88423a5bf1 -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: I1e594adc9905b5c2baebe3471f6bf76c41190273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 03:14:01 +00:00
Arc Wang
e4771d0706 [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: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -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: I90dfebd32d6424832568fd0f807144f1ccf37535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:44 +00:00
Tsung-Mao Fang
5fd3f89a33 [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: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -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: I131a5b7edc178694dc1d9c9e35075d341ab34227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:43 +00:00
Arc Wang
2a36e2f772 [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: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -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: Iffe3c7383e3717cee73fa700f8dd4dc331f1ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:42 +00:00
Arc Wang
9d4fa149ad [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: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -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: I9bc2354ed015d3802c85673fcee3d6198370cbc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:57:19 +00:00
Tsung-Mao Fang
a4b007cc8b [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: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -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: I755e2fa549d07e7aa590b78026f92b10d541f5f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:57:17 +00:00
Arc Wang
88423a5bf1 [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: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -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: I49ffd06963df7efb8baee3beb86da97a27daf1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:57:14 +00:00
Arc Wang
1d71f3e2af [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: 1732408586 -s ours am: a80076e2f3 -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: I410e4b0ff40a7e9ab5922b4542314b09e7e2dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:32 +00:00
Tsung-Mao Fang
e025e77430 [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: 2abeb254ea -s ours am: 9c070af470 -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: Ibbc64f16dd0303d4ca59a321486e1bb16b934654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:30 +00:00
Arc Wang
d1135c52b3 [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: 7c863fb69d -s ours am: 4560b69963 -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: Icdc188bafc752618012a111427f1d72cd0710002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:28 +00:00
Arc Wang
a80076e2f3 [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: 1732408586 -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: I66eb46b7f25b9d3bc772ed945751858d503f9574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:11:26 +00:00
Tsung-Mao Fang
9c070af470 [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: 2abeb254ea -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: I3aef9cb7abcb044840d5d56ab5c79679920529cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:11:25 +00:00
Arc Wang
4560b69963 [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: 7c863fb69d -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: I19a2734d15b42047dcae7efad291d1ce51c633d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:11:24 +00:00
Arc Wang
1732408586 [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 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: I44ab9fffbeada73003e5876eeb83f2cc07c7928e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:51:32 +00:00
Tsung-Mao Fang
2abeb254ea [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: I3d7f8e78b6d9febcd06c7d84cc5c560b442ae294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:51:31 +00:00
Arc Wang
7c863fb69d [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598

Change-Id: Ie9bd953a9c613770fc12c121fdc155ee8b1aecaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:51:30 +00:00
Arc Wang
ab3adbd4dd [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 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: I6a43ef0a5d3be0ccea94ff04b6ef83bca00981b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:34 +00:00
Tsung-Mao Fang
2e3f8a30a1 [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664

Change-Id: Ied5f7df1a6f1e1f53a07dadcd828d8042a677c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:32 +00:00
Arc Wang
4129c273cc [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598

Change-Id: Ia6a7f76c885e08cbf388bbd912b08f481ae23575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:35:29 +00:00
Arc Wang
f7dac28d6c [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: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 7541807566 -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: I0a12cadfc7f4d44fdcf5e872c016aec346a3285f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:16:36 +00:00
Tsung-Mao Fang
173c6d2bc5 [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: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: f93e140bb0 -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: I92add9c27101e9a2c532107758c2bb07edf34b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:16:35 +00:00
Arc Wang
fc4508f9e6 [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: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: a21406b20a -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: I6ca3c529702f89dc1d830bf213a7aa3c4f618aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:45 +00:00
Tsung-Mao Fang
5e6791c5de [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: 62b8cd91b5 -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: Id734bfad0687546026c731a5d415c76e0283ec78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:15:44 +00:00
Automerger Merge Worker
7b5acf7cdd Merge changes from topic "am-6c3e7fc607f1452d9118f418d44cf6b6" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: b5e5c80038 -s ours
  [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: 3f4c9a480e -s ours
2022-06-04 01:15:02 +00:00
Arc Wang
b68d21e001 [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: 1e840598ed -s ours am: 6e3b0189b0 -s ours am: a568b504d8 -s ours am: 2e70386b3d -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: Ib9652559cc61eac489ed78bc8bfe74ad1366aefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Arc Wang
9a80160223 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: b5e5c80038 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I74f6d316f8ae2ebda561862269e0a23b299d7e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Tsung-Mao Fang
00271a53d3 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: 3f4c9a480e -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: Ib7ef2994fdcb67c243fed04a31ba4470c0e906d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:58 +00:00
Tsung-Mao Fang
8938fb5914 [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: ddc4cbe128 -s ours am: 8ba2996c1e -s ours am: 6798bdac09 -s ours am: 4a38992eea -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: I263ebcab607091881a63217fde066f532775cb04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:57 +00:00
Arc Wang
7ca4462df8 [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: 72437e7d60 -s ours am: 49ce605299 -s ours am: a942fc2f5b -s ours am: 2d39ef425c -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: I3d946b7a6856255974581b1a62a10e04948e43a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:47 +00:00
Tsung-Mao Fang
8b0f218a41 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: 52a571f239 -s ours am: 86b1ff3584 -s ours am: 0d51854ff2 -s ours am: d76d5d2847 -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: I294ab0d4e7831603d04549fb7fd8e548aa0b0e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:46 +00:00
Arc Wang
649676228a [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 -s ours am: 1b012c577a -s ours am: 857949e540 -s ours am: dd4263fba0 -s ours am: 4fcb75175f -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0e5c208a4f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704659

Change-Id: I224e0ebf29dc632368843491d2fc929de767f17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:37 +00:00
Tsung-Mao Fang
fe69402b1a [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 -s ours am: f5ab97c8cd -s ours am: bc6b22e659 -s ours am: 7182776d77 -s ours am: e07ccd7278 -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: I316069e3f4fff39b98e7c22e59afdc599d1b8cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:36 +00:00
Arc Wang
b5bdaeeec0 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev am: 0ed1190469 -s ours am: db800e96b9 -s ours am: 98cd637460 -s ours am: de0291af09 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 90968c8437 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704660

Change-Id: If7355342acdecb85ca85054c787023c2e2e685a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 01:14:28 +00:00