Commit Graph

104442 Commits

Author SHA1 Message Date
Lin Yuan
1911d2fbb4 [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 skip reason: subject contains skip directive

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

Change-Id: I4e6b033fa82d96dca58ddd75c401a13187782477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:51 +00:00
Lin Yuan
312065af42 [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 skip reason: subject contains skip directive

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

Change-Id: Ia06aec9e8c35296dd35a1e2d1e921a9d8322f65b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:40 +00:00
Lin Yuan
86756bbbcc [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 skip reason: subject contains skip directive

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

Change-Id: I32da9927699a97187fe4ff5876e32019565389c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:31 +00:00
Lin Yuan
4b9394808a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 1e45df2451 -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: I3d8689297f87413dcc3db1cdb0f2787605440f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:23 +00:00
Lin Yuan
ae20f0e5bd Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Id4ffa9bb57daafaa21558538b93ecd0e32b30fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:06 +00:00
Presubmit Automerger Backend
24d50a6c2d [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -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: I8de12fa7640e257fdf65f2e420305c6008653767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:55:02 +00:00
TreeHugger Robot
807ec69c46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 138ee00007 -s ours am: c5d09db1d6 -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: I801d5fcfb3f11aa548ce51a9b5b8cc37ff06b3eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:54:58 +00:00
TreeHugger Robot
4860d558bf 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158869

Change-Id: I7e5c8a12ebb812cc36b46f662b2521bd7acc5cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:54:51 +00:00
Bill Yi
9729646142 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -s ours am: 21954666c2 -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: If95b6d81f9dcdd0dfaaef46a2195d00e6428b489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:54:49 +00:00
Bill Yi
0e7cb1e969 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -s ours am: 38da1316dd -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: I904604f8af0629bad4a0b7864a4c0c5524198b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:54:36 +00:00
TreeHugger Robot
3f06f6f6d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: a3be04c95d -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: Ie4f25a8ce3cfa90f0e493cbf31d56c070592cb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:51:33 +00:00
Bill Yi
4dbeddd095 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dea4314ee -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: If5116e75ad83807763a6018b6f638c645b9ad874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:51:25 +00:00
Bill Yi
d839af3be9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87a8b49ca0 -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: I811fb76768406a0e3cadbf2d835f3ccb55543fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:51:04 +00:00
TreeHugger Robot
c5d09db1d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 138ee00007 -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: I20a5658d81f4db703adb653537bf5c9232bf9d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:41:11 +00:00
Bill Yi
21954666c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fc6315b65 -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: I88df0a7f64d16f4de96ae09682c3f49c7282979e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:41:00 +00:00
Bill Yi
38da1316dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca3a25c900 -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: I91178620dd4608b69333e653c2ae51526bf9d2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:40:51 +00:00
Bill Yi
0a241995c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -s ours am: 1da0b28099 -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: I9f416c3527365123a2d7bd9436796a9e8fe5cbef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:38:35 +00:00
Hugh Chen
2744afdf71 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 5124046494 -s ours am: e4d07bd71c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I997226bd7661d0012b529564efcdd20ad46b24ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:38:06 +00:00
Hugh Chen
5010b744cd [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: b71cc3b9fd -s ours am: c70937ef85 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3d9c82d691a9381e33ddff8e8ed3e4fb0b7fcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:37:49 +00:00
Hugh Chen
1b7ea332d8 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: 7bde548ee0 -s ours am: d5d8bbd18d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea8756d83c377715a1dc13ef6d73c579f2cb013b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:37:42 +00:00
TreeHugger Robot
28b074f75d Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719 am: 8ebd0c1381
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: I59ed05aa0c4cd5821c56385c43446b01994d02d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:37:03 +00:00
Hugh Chen
7bf3c34e4f [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 10bdea1a98 -s ours am: d37402a2de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0872332fb93a0367780b2a1f37b43041f4131942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:37:02 +00:00
TreeHugger Robot
cc17b9868e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1 -s ours am: 8af957252a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81fca2b4e9a35617069684c71d3509b1b354672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:35:42 +00:00
Bill Yi
165bf47fd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132 -s ours am: ff8cd75636 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9355aaf22119321bd472ccf66d4c830a3fef385a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:35:31 +00:00
Bill Yi
571ed2c95a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours am: 803533153b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3288113c7aecf971b27c9814580a35a700252ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:35:23 +00:00
Arc Wang
50f4187da7 [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 skip reason: subject contains skip directive

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

Change-Id: I693e09762e09f307305d90beca1a0ad7b857dcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:30:26 +00:00
Arc Wang
7d7de4d6ae [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 skip reason: subject contains skip directive

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

Change-Id: I9e05c250a947fed916471bfcdcc43b8e6a8cdc79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:30:16 +00:00
Arc Wang
9df67b4963 [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 skip reason: subject contains skip directive

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

Change-Id: I97e83494d56faedbb2bd763647285a11c6e8469e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:30:04 +00:00
Arc Wang
5735cb0399 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -s ours am: f6d30578b6 -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: I1b0314acd754940676c3cd8299f410aa51c4f5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:29:52 +00:00
Bill Yi
1da0b28099 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388 -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: Ib98e5cf90da64be0b86d62d3c75b6b3a523d2804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:29:33 +00:00
TreeHugger Robot
ef4cae5270 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -s ours am: 7828afe859 -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: Ie107f975dc0527044eb0e60bf911df5d007df17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:29:19 +00:00
Bill Yi
2df65d6f76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -s ours am: 2819fde801 -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: I88f6d50a51de4b775dd84ec65ed9381d2df9a4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:29:15 +00:00
Hugh Chen
e4d07bd71c [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 5124046494 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39b00c38808a30b956295ca511e69fe9884aa75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:25:13 +00:00
Hugh Chen
c70937ef85 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: b71cc3b9fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb64860b140639650a9632626545c93126eb2165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:25:06 +00:00
Hugh Chen
d5d8bbd18d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: 7bde548ee0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib58173e8bdc8e2c906f1430fc0bb745fc714fea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:24:59 +00:00
TreeHugger Robot
8ebd0c1381 Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690

Change-Id: I3d5105e3416afe6d0e5acb64da61b9b2d39f0915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:24:50 +00:00
Hugh Chen
d37402a2de [automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae am: 10bdea1a98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dce5e69a84497905ba2c1579b827720fb4a3bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:24:46 +00:00
TreeHugger Robot
8af957252a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76baca80a92ced5c84844c648ee9b466886e7e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:20:45 +00:00
Bill Yi
ff8cd75636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic513985f0a682f21d4934463304e179c4f752089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:20:25 +00:00
Bill Yi
803533153b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9bd95a0d8ce82385dfdc3435ddce5b129fcb98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:20:07 +00:00
Arc Wang
0270951c5e [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 skip reason: subject contains skip directive

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

Change-Id: Ic4b722086175803d1352855915ffb3d32eb1e55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:06:36 +00:00
Arc Wang
ac35d1fba1 [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 skip reason: subject contains skip directive

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

Change-Id: I85ce0fb7c6c80d140055a348a66373b2978116fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:06:29 +00:00
Arc Wang
56094f5a5e [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 skip reason: subject contains skip directive

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

Change-Id: Ie8c4b1bff4f405371c46810afac011d2655d92a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:06:21 +00:00
Arc Wang
f6d30578b6 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f -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: Id338f4ffe6d94f2552281c47c5589739604c5fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:06:14 +00:00
TreeHugger Robot
7828afe859 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee -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: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2 -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: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 00:03:59 +00:00
Bonian Chen
734d1692ff Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528

Change-Id: I19c92b5cf7e6463efb5a9aa822cc520855732907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 04:26:02 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Bill Yi
07bfd0bbd9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7201ffacb47728950b9799b2c72db212dc290df7
2022-06-22 19:10:00 -07:00
Bill Yi
b070ddda17 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2d6dbb4522ef217b94075bb4999a5276f983095f
2022-06-22 19:05:21 -07:00