Commit Graph

107701 Commits

Author SHA1 Message Date
Arc Wang
cb0ab408d6 [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: 875262e4a5 -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: Idad099ff8848dd130d0f12426ae114d0aa8580d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:29:41 +00:00
Arc Wang
439c1355e2 [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: 6b7d388142 -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: Iec78e1507a3cdd8482fb7d14afa1d35a795eb8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:29:22 +00:00
Arc Wang
015cf76d3b [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: c5d05396a1 -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: Ib230ff648923952a8e0e76c92006f4975696396e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:28:34 +00:00
Arc Wang
9afb6046aa [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: b158557351 -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: Ica23a67739d2faf10dcc42f26204a89f59ddf617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:28:33 +00:00
Arc Wang
3ba0ba8ef9 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -s ours am: c9ebc73f62 -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: I07e19c7ae1f90c3ca5054566ab95f9a544e1662b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:27:39 +00:00
Arc Wang
6102be3afc [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -s ours am: ea65366302 -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: Ib8945da1f156204bea880485f05d06472f019cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:26:44 +00:00
Arc Wang
b1ba09bdfe [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 9f063201f4 -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: Id929dedef206db63e4c9424afa4c950b9397254c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:26:43 +00:00
Qasim Javed
ef0b586880 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 am: 01f4cbf40a -s ours am: 5026bc6fb8 -s ours am: 2ad5736490 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 29b7f1d5fa is already in history

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

Change-Id: Ifd645142ff5f388e9c31829a44bcbbf428ab583f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:15:32 +00:00
Automerger Merge Worker
dfe03e2703 Merge changes from topic "am-5e89edc40b6a4945b5ec9d7a583855ca"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 78aed2586c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 6bbca58575 -s ours
2022-05-11 02:59:28 +00:00
Bill Yi
57f42ee8b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -s ours am: 78aed2586c -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: I3770b753d0c1f981c4506ccb1c69099c5c6dc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:21 +00:00
Qasim Javed
bb67810efc [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 -s ours am: 941c731884 -s ours am: 980062d417 -s ours am: 19a7b957a7 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: I177588418c84242e78108731dea9a3dc47a73313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:13 +00:00
Qasim Javed
9c618221aa [automerger skipped] Only cancel bonding if pair button is not pressed am: 29b7f1d5fa -s ours am: b303247238 -s ours am: a87bd0a8c5 -s ours am: b1b393c47b -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: Ib9242c27b2c43b78b555212a6c6a655e75169f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:12 +00:00
The Android Open Source Project
9cb7a4e3dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 6bbca58575 -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: Id119f4c973c8bae59a2b6ebb8f7e54b195bd841a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:53:07 +00:00
Arc Wang
875262e4a5 [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 skip reason: subject contains skip directive

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

Change-Id: I1bc65eacfb493ca90457bd3eea8172b813de4110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:43:52 +00:00
Arc Wang
6b7d388142 [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 skip reason: subject contains skip directive

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

Change-Id: I2847bbb6198945f2c3cfe3138aa7148246e6b718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:43:40 +00:00
Arc Wang
c5d05396a1 [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 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: Id91b2721029862a3aa7e09655daa399020b7140c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:43:27 +00:00
Arc Wang
b158557351 [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 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: I9e67dbec7ce78ca9d904f84c1ca0965bbf08611a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:43:26 +00:00
Arc Wang
c9ebc73f62 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -s ours am: b3dd21bf61 -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: Ieb18e1c8f58e0c1024889aa80391984aa54fb6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:43:10 +00:00
Arc Wang
ea65366302 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -s ours am: c0e620bfb4 -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: Id740836c3760db26c671a692f38c1c7fc4dd61a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:42:55 +00:00
Arc Wang
9f063201f4 [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -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: I9008a3000f8b1494cbeb42172818583c1a31ae0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:42:54 +00:00
The Android Open Source Project
382cb77635 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: c1631f4c90 -s ours am: ae0872bd12 -s ours am: 37c0475005 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icab138550e65ea8d503d57bca5e1d1cee2f45358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:40:31 +00:00
The Android Open Source Project
174b284e2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: d6c71eeac6 -s ours am: c6f5280b23 -s ours am: a0e5dcde4c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c745a8ffc989cf84e9fbaa83e40e5ee839627ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:35:16 +00:00
Bill Yi
78aed2586c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -s ours am: 2257809a29 -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: I5bbb9b1c690ccea285fdf1f40df1837e3d719cfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:33:12 +00:00
The Android Open Source Project
6bbca58575 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -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: I428f87151841f8b9ea80ab7e3b3a21657c88a5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:32:59 +00:00
Qasim Javed
2ad5736490 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 am: 01f4cbf40a -s ours am: 5026bc6fb8 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 29b7f1d5fa is already in history

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

Change-Id: I872dfeea86de9c24edb1f2f234133ec8d8cf8536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:32:38 +00:00
Qasim Javed
19a7b957a7 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 -s ours am: 941c731884 -s ours am: 980062d417 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: I271e22c97332eefcd5166bf668d6598734ce0492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:32:15 +00:00
Qasim Javed
b1b393c47b [automerger skipped] Only cancel bonding if pair button is not pressed am: 29b7f1d5fa -s ours am: b303247238 -s ours am: a87bd0a8c5 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: Ib48771f7471aa52c3bcc531fc26fe96183f817a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:32:13 +00:00
The Android Open Source Project
b1e57f2fac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: d6c71eeac6 -s ours am: 2001665468 -s ours am: 8203d6dedc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ef680242d6a0d58a12427e238cf9ac1ee94491e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:28:56 +00:00
Arc Wang
4786e9074e [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 skip reason: subject contains skip directive

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

Change-Id: I8ed460c6472a53295c75fb1741341e4c28d4862b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:50 +00:00
Arc Wang
1a352ac71c [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 skip reason: subject contains skip directive

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

Change-Id: Icff574bec45076626c2f733f80b5bc86ed33397b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:43 +00:00
Arc Wang
dbd9eafd30 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev am: d5cec0f5b9 -s ours am: 3d0398f88f -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: Id5976b520e569dc4fb65a5d3bf9e7ef33af91182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:34 +00:00
Arc Wang
ad75641b27 [automerger skipped] [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b am: 930822bc13 -s ours am: e92949a3f8 -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: I5577b88e2de2c26106838d8617a0f2876aad0b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:32 +00:00
Arc Wang
b3dd21bf61 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -s ours am: c0470839f1 -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: I2fbe33253b14dbab92ac60fe1a91a1982e308014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:23 +00:00
Arc Wang
c0e620bfb4 [automerger skipped] Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev am: 3c2f252e62 -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: I52ac19a60e973fcb4afb8c28e2a5708c31251b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:04 +00:00
Arc Wang
25424a980d [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -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: I62e76d6392931f44c7279cdfe9d339632a47b59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:21:01 +00:00
Arc Wang
5a0d3c4fcc [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: 2752aa641b -s ours am: eaaa731910 -s ours am: 5dffbaabd5 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: I4b93bdaf2a28075ea1a0bff0862d6c72534f82da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:29 +00:00
Arc Wang
811ad55eee [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 296da54a32 -s ours am: c5af6fcef5 -s ours am: c7f3c96675 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: I809da8b14aff5c8908a8ec52c185a561bb17f754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:28 +00:00
Arc Wang
0846cbfb3a [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: ac534873d3 -s ours am: 89c2e74bbf -s ours am: 45602ebadd -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: Ib5e9b5b933d5c0495d247ad1a2d243fdd3ef06cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:19 +00:00
Arc Wang
27615996c3 [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 21427989dc -s ours am: 83f6c64b50 -s ours am: 1ff4333ab5 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: I53ad6f453fe3bfbbcb6f14223891d9daed000fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:18 +00:00
Arc Wang
294596dd8f [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -s ours am: ac534873d3 -s ours am: 51ba24633b -s ours am: 35e0b0353b -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: I7e7bf41ae2003c8622961bcec034cadfda001195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:09 +00:00
Arc Wang
433af32302 [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -s ours am: 21427989dc -s ours am: 31833cb931 -s ours am: f071ba28b1 -s ours
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 e4c22580c9 is already in history

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

Change-Id: Ibf1d0c5d84ee80285ca258d33130dd3e6da4a490
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:08 +00:00
Jack He
ef100bfdfe Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a am: 55da62f36e am: 272eedba22 am: a79435beb5 am: 939e53fda2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951

Change-Id: I0a9f3f7b43fc0983cf1743a59dc201ed4b507384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:17:00 +00:00
Bill Yi
2257809a29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dff3f7f106 -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: I8e1206a8f979654348f1425c2a2479d12e12db41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:54 +00:00
Treehugger Robot
ec0914fcfb Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df am: 1543eff3c2 am: 976d920650
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I74b475b997a4e816aa95237a980121d1b317292a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:52 +00:00
The Android Open Source Project
ecd69b95e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -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: I28522223ba08f62402b51732e23f8ae90bde407e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:39 +00:00
Qasim Javed
5026bc6fb8 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 am: 01f4cbf40a -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 29b7f1d5fa is already in history

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

Change-Id: Ie20b4675ce63d46a6f5c1ad8a4be07d2533f59cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:03 +00:00
Qasim Javed
980062d417 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 -s ours am: 941c731884 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: I799d3e7a31359e9fe2a4b809024af1440288a2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:07:28 +00:00
Qasim Javed
a87bd0a8c5 [automerger skipped] Only cancel bonding if pair button is not pressed am: 29b7f1d5fa -s ours am: b303247238 -s ours
am skip reason: Merged-In I868af9b795f1bb0766656e4619bd06dc8028008a with SHA-1 419b7fa289 is already in history

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

Change-Id: I41601e63c99a655de49e4447ca8b17d18f1a63b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:07:26 +00:00
Qasim Javed
57b50437d7 Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 am: 892e32c369
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591

Change-Id: Id392cf0574830d131fdce1e05a7091b1d999bac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:52:15 +00:00
The Android Open Source Project
dc5e8ddc89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: b9acf45316 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6082116e87bcb90bd54d3194d9ab41d5a1187108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:48:33 +00:00