Commit Graph

104592 Commits

Author SHA1 Message Date
SongFerng Wang
929de6f61c Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc am: d100f24a62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I6b1d0f93dec2431c97b7044549042301465ee0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:21:48 +00:00
Tom Hsu
6b8c2db301 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057 am: b90a6c8c81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ic6454a0deeffb299a311a0087b87953b4312b5c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:19:07 +00:00
SongFerng Wang
d100f24a62 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I2b7d2833a72412e359fa1680ab2852edec58672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:51 +00:00
Tom Hsu
b90a6c8c81 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I6bc2490339d6052629c722fe89f8547f3cb7c978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:32 +00:00
SongFerng Wang
bde99c02cc Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: Id6017f330b9c7071e0df48d48ca2319b0b865365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:27:36 +00:00
Tom Hsu
b903b4a057 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib2e09e95c6dbef9b54a8e1182e5f3b57ed0d0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:19:02 +00:00
SongFerng Wang
55ded566e3 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev 2022-05-11 11:17:28 +00:00
Tom Hsu
d375456251 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev 2022-05-11 05:51:00 +00:00
Arc Wang
941b13f26a [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -s ours am: 6d20bb4396 -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: Id994be5fb022c697b9c192751896d502441ea060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:43:10 +00:00
TreeHugger Robot
8636aa6a93 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c am: f53aeb97fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I4ece0278d16658065b1e3ba27553284ea010876c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:41:48 +00:00
Arc Wang
5dd819ab90 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: fe4df8e6a8 -s ours am: 6ea2ae7fe8 -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: I2e757d6a702c4a4aa46dfc39d49a7cc0daa748ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:22:22 +00:00
TreeHugger Robot
afe6e93cb9 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: ebd46572c4 am: 10ee27e781
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I9d41e3324a554725884e3dc3afd5c232a8e4ea0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:22:11 +00:00
Arc Wang
c07ad0d2cf [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -s ours am: 5bdf17dd57 -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: Id6f0e3efba332beef418a4a8705905f647d375fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:22:06 +00:00
TreeHugger Robot
935fbe577e Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c am: b53549a4c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: Ifed5031af5d1b50160d337daccb1ee1ddc1acf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:21:54 +00:00
Arc Wang
6ea2ae7fe8 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: fe4df8e6a8 -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: I8c92fd1e645d3b83ab608fc84a7ab9fed7a620b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:08:03 +00:00
TreeHugger Robot
10ee27e781 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: ebd46572c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I0eca1b2ff8faf38961b47f51ce9119423d281465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:50 +00:00
Arc Wang
5bdf17dd57 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -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: I38328ae8b87163d8e4215e602411bd7c73193105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:46 +00:00
Arc Wang
6d20bb4396 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -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: Idccf85c9056c17587abf429223c1234f865fa6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:42 +00:00
TreeHugger Robot
b53549a4c5 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: Ib7e0937ab4ae2e61664e69054d4f3db5ab91312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:40 +00:00
TreeHugger Robot
f53aeb97fd Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I668d1a7f8fd95b4f7ea65b589fd4c7c698e6772a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:32 +00:00
Arc Wang
5d2cd15593 [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: 006b5b4102 -s ours am: ef4edd0a54 -s ours am: 4786e9074e -s ours am: cf76d97ee8 -s ours am: 14cdcb1845 -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: Ib7b77ba38640242048a112fd527633f69637a040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:32 +00:00
Arc Wang
27d33cfc88 [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: 006b5b4102 -s ours am: ef4edd0a54 -s ours am: 4786e9074e -s ours am: 2c8ac66c10 -s ours am: 93f8a23121 -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: I761b060c1360548719058e4a838516d631e6fd97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:24 +00:00
Arc Wang
13962df0e1 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours am: bf6d1965b7 -s ours am: ce006f6122 -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: Ibc11017ed0ec3106a73e8f2bc76fe2e305fb4f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:16 +00:00
Arc Wang
670012b2a0 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours am: 1b40f16b0c -s ours am: 6c77e5474e -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: I479488e7e698b0d0f3e2249e0e432d13ffedffaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:11 +00:00
Automerger Merge Worker
a274260ed3 Merge changes from topic "am-de453557dcf94cceb03fbe375936666c" into tm-d1-dev-plus-aosp am: 19c8c9f28f -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1682354551 is already in history

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

Change-Id: I7a5ca5cf7564a921bf607442f3d2383a02cc5022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:04 +00:00
Arc Wang
7772cc64d1 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 40c3a3ac6b -s ours am: c27888e778 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: Id208a8b2f97e92b8df922321b0dced93132cc8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:07:03 +00:00
Arc Wang
2d7726f572 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 3478713e2f -s ours am: 42d1d95dbc -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: Iec702bbe574ec83df300763297967fd7c44c6dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:06:25 +00:00
Arc Wang
1b76290084 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours am: 92d39fe026 -s ours am: 8131f4f9d2 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: Ibf1470dfc6d702bd77196e8dfcee70cd1d05fa04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:06:24 +00:00
Arc Wang
7b25cf1173 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: 5a71f10f08 -s ours am: 82f4c614cd -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

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

Change-Id: I49f661fe40c7bb08353f1ebc4e85697ddb612242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:05:59 +00:00
Arc Wang
7120c51251 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: 868417c5ac -s ours am: 75e78a8e53 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

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

Change-Id: If69fa0ec976913a0617c7cc0da114ab93970a262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:05:31 +00:00
Automerger Merge Worker
f4b2ffe546 Merge changes from topic "am-b0441449ba0041069ef7bc6ef763a79b" into tm-d1-dev-plus-aosp am: 54a77adbb6 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1682354551 is already in history

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

Change-Id: I0a914a7cfa515ed0295ba7fb2f318198751a0f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:05:08 +00:00
Arc Wang
6c6d4c48de [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: 2211d5cf79 -s ours am: 5a7fecd6a8 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I217d9478478dca54f058339def76fd8dbd8c04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:05:07 +00:00
Arc Wang
d7e5139468 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: c8d76ad2ef -s ours am: dfeb9ba035 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: Ic50dcb570ec13d35a2c173c7b521323179cbf65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:04:19 +00:00
Arc Wang
ee36cdb985 [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 5167d5ff4d -s ours am: 5925b4e186 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I35d5930f44bba30ae145dbf0795dce5634c0bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:04:17 +00:00
Bill Yi
b0716b672a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 2ac18e55df -s ours am: 5ac860c91d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I392ef81d180d1ca61756a1bfeacdc2b440db9dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:03:29 +00:00
The Android Open Source Project
78cdcc609c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 72d5298dbe -s ours am: 14352476ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3830ce925511bc58462e57674d7332b153d2b12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 04:03:14 +00:00
Bill Yi
08863d4b26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 6a9ed355c7 -s ours am: 5b4079362f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22c7ac0a11f744b960e243d261d1aac73b119a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:47:19 +00:00
The Android Open Source Project
a48162012d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 71d9d870a2 -s ours am: 1def88d8b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia938e8ea2e8ba3049ae8c73006b7fafd22ceedf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:47:05 +00:00
Arc Wang
4181ce9143 [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: 006b5b4102 -s ours am: ef4edd0a54 -s ours am: 4786e9074e -s ours am: cf76d97ee8 -s ours am: 28e045228e -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: I5afe118a4849d4f1510ba5e860f73889bdee05b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:43:21 +00:00
Arc Wang
29da60cdcd [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d -s ours am: bb81ea5351 -s ours am: 1e252c20eb -s ours am: 4464225492 -s ours am: 1a352ac71c -s ours am: bf6d1965b7 -s ours am: 689ba938a2 -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: I5150b206eb126f41a14a4cfaaff0042105f1cab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:43:16 +00:00
Arc Wang
017f343477 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -s ours am: dbd9eafd30 -s ours am: 3478713e2f -s ours am: d43caa6afb -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: If016b017bd72aac4077e2b94691a8e1fe30f4037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:43:10 +00:00
Arc Wang
1b2c59e6f8 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -s ours am: ad75641b27 -s ours am: 92d39fe026 -s ours am: 6c5fa9cebb -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 babe83e217 is already in history

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

Change-Id: I4dd2b0123782553812982d4d1e9015969516021b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:43:09 +00:00
Arc Wang
801d5e5555 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: 868417c5ac -s ours am: 3aea389f25 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 1b7fa6f8fc is already in history

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

Change-Id: I1eca05566a9e36353c643983e462b6eebb011647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:43:01 +00:00
Arc Wang
08e9139d25 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: c8d76ad2ef -s ours am: ea1569e053 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I90306e01fc325686cc1f55247e87e8332f4c699f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:41:42 +00:00
Arc Wang
e82dc2d641 [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 5167d5ff4d -s ours am: 82deab9613 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 f288d3a31b is already in history

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

Change-Id: I5ad1c55aa26a80af686824d7b602535546bc3e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:41:41 +00:00
Bill Yi
eb23827448 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 6a9ed355c7 -s ours am: 1663ddb2a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c6e5b38c6085f65426e94b674cfd26f6de97c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:40:13 +00:00
The Android Open Source Project
a5b87d8eec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 71d9d870a2 -s ours am: 96c97bc19c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic36874aee8a57009c620e907c943126b22cae45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:40:00 +00:00
Arc Wang
6e9fcaa1e3 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -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: I572ec0d060af1bf8d741a15dcfeddba5df991820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:39:19 +00:00
TreeHugger Robot
0fa209b89c Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I683531b19121643ea5000d3bdd4344d0c7c9cfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:38:59 +00:00
Arc Wang
fe4df8e6a8 [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: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -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: Iff1011446823c7e647d4e85b420c94aecf5593a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:38:02 +00:00