Commit Graph

103699 Commits

Author SHA1 Message Date
Arc Wang
82f4c614cd [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 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: I8db1c7992864370607f1d8616a0a602d2298760d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:28:25 +00:00
Arc Wang
75e78a8e53 [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 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: I61661b2803bd38575000abaadd2d33e635c52ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:28:17 +00:00
Automerger Merge Worker
54a77adbb6 Merge changes from topic "am-b0441449ba0041069ef7bc6ef763a79b" into tm-d1-dev-plus-aosp
* changes:
  [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
  [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 124359ecb5 -s ours
2022-05-11 03:27:36 +00:00
Arc Wang
5a7fecd6a8 [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 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: Ia24b80d86b2ec8dffe15ff86a38da5eb4baad8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:27:31 +00:00
Arc Wang
703e94b10b [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 124359ecb5 -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: I44b477205d8f35f5060dfd050a899ff94f61b56f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:27:29 +00:00
Arc Wang
dfeb9ba035 [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 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: Iae06daddf746d5a3be1dc99a51bc3c8d6f763508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:27:28 +00:00
Arc Wang
5925b4e186 [automerger skipped] Verify ringtone from ringtone picker is audio am: 1b7fa6f8fc -s ours am: 25424a980d -s ours am: 5167d5ff4d -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: I2a1cc2489286854c3c1a5611aa1d4fd077c8161a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:27:26 +00:00
Arc Wang
335cf2ccb8 [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 skip reason: subject contains skip directive

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

Change-Id: I328d6a1e0617d3757f71cdf9687cac8ba8c4dfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 03:25:46 +00:00
TreeHugger Robot
f39872bc18 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev 2022-05-11 03:02:52 +00:00
Arc Wang
2c8ac66c10 [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: I8047a9c2b3c520309a6220363cef7746a0cf2403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:35 +00:00
Arc Wang
1b40f16b0c [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: I6dbb9bc3f1aff3313f1c6688517a91ee953efc0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:30 +00:00
Arc Wang
40c3a3ac6b [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: Id5e15170fbcb921fdc4b6e30c13e0367fcb53f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:25 +00:00
Arc Wang
05797e8bc0 [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: Ifcf51a3b97a79ba83589f058056b218e0b9c0f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:23 +00:00
Arc Wang
5a71f10f08 [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: I20cf66d1cd1d130c0b28b0aa777ec7b8453b9105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:12 +00:00
Arc Wang
2211d5cf79 [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: I918c4d752e1fe15fbdf2c6e41cdbeed3593826be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:51:00 +00:00
Arc Wang
124359ecb5 [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: I7b3750b3e1b3ccf49c8f9132ee37b3fb0ff3ad1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:50:59 +00:00
Bill Yi
5ac860c91d [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 skip reason: subject contains skip directive

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

Change-Id: I62af2540d8b2641388d3085db1f6b785ce044f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:49:37 +00:00
The Android Open Source Project
14352476ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 72d5298dbe -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: I8390119f088e71af4943c4f46931f3d8ebca53f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:49:23 +00:00
Bill Yi
5b4079362f [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 skip reason: subject contains skip directive

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

Change-Id: I277cb1449e68db47b482212df28334f3e1b2ead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:47:40 +00:00
The Android Open Source Project
1def88d8b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6503ce14a7 -s ours am: ecd69b95e3 -s ours am: 71d9d870a2 -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: I5845acdf4247fea0e54a1c7bec9c781b6ecfa6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:47:27 +00:00
Arc Wang
cf76d97ee8 [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: I099db66a89c262cc1558bf73e104d522db4fc1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:51 +00:00
Arc Wang
bf6d1965b7 [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: Ib518dd4a4e4a85bab086cbe21b6416774850ea9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:38 +00:00
Arc Wang
3478713e2f [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: I4670b8531801aaab2e157089e66cc4f0883536b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:26 +00:00
Arc Wang
92d39fe026 [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: I491b2b6b08b6182eb16d6544195b9562d8dc94fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:25 +00:00
Arc Wang
868417c5ac [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: I066202df1a2281ca2ca780afedd89eb737756537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:45:18 +00:00
Arc Wang
c8d76ad2ef [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: I11896b6a1b3ea6c315a5ef0c01aa296078a2f194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:44:15 +00:00
Arc Wang
5167d5ff4d [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: I1a1e2aefa66f380f92f07e1cd9ab438c15f117c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:44:14 +00:00
Bill Yi
2ac18e55df [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: I445959d3ef3645dbaa26b354065d6fc2eb41ffd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:37:32 +00:00
The Android Open Source Project
72d5298dbe [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: I0883190767ae988b18e7d131901f20c0af15d8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:37:18 +00:00
Arc Wang
a1bc77f4a4 [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 skip reason: subject contains skip directive

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

Change-Id: I8f39c1878d2c6e4acac80a187cae03fc551711bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:33:12 +00:00
Bill Yi
6a9ed355c7 [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: I343624030f95e24f5454dcbe38993cc7b27da92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:26:04 +00:00
The Android Open Source Project
71d9d870a2 [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: Ib4e47c802d0b2d560245ad7bd6f2b0154ab1564d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:25:50 +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
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
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
Arc Wang
4daf31225d [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 skip reason: subject contains skip directive

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

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

Change-Id: I5f2a7771c8078684aac2346ca8c1c0da5c1b59d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:45:59 +00:00
Arc Wang
09c382d878 [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 skip reason: subject contains skip directive

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

Change-Id: Ibe47e367afe145e51e985c43ba64786ea980a9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:43:25 +00:00
Qasim Javed
941c731884 [automerger skipped] Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 -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: Ib588f44d8ea1c27cb92f35147513c5fcc322ae34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:43:16 +00:00
Qasim Javed
b303247238 [automerger skipped] Only cancel bonding if pair button is not pressed am: 29b7f1d5fa -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: I8f78283545575175b81b163e1a7a0ae97ec38acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:43:15 +00:00
The Android Open Source Project
ae0872bd12 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b1c6b4ee -s ours am: 249269c95d -s ours am: c1631f4c90 -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: I201f38e07700e01df2a05eb4787e361c13efeb55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:19:36 +00:00