Commit Graph

107667 Commits

Author SHA1 Message Date
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
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
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
Jack He
c8511ebc33 Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1 am: 36be40cb5f am: 8203f157ed am: 49e355a88e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: I6e0cca79163cef7f8de0406a1f21b4b388f93712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:47:20 +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
Qasim Javed
892e32c369 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: I01a36ada39473f06dd9a3b9b67485ba2c338fa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:44:17 +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
37c0475005 [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 skip reason: subject contains skip directive

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

Change-Id: I10bda1240d790a9050ff62d56c376b31af0f4b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:27:15 +00:00
TreeHugger Robot
83baf5b9fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: ebd68c7887 -s ours am: 783967426b -s ours am: a0aba4d9b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0cada588242136d7d64db6ff8935df8ace719f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:30 +00:00
The Android Open Source Project
35943d7d44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 49f9188b85 -s ours am: e826459b9a -s ours am: 9f18783110 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04ded594a658d2fed78d9c94f1ae75d5924c5b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:29 +00:00
TreeHugger Robot
4297c8e811 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 25f2aa6a3d -s ours am: 403ce6771b -s ours am: 39bb8baaef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idc8311c521d9e12fe82086255d84ead6c7e3f27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:27 +00:00
The Android Open Source Project
92085d0f79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 74cd0c684a -s ours am: 5a5f7e98f9 -s ours am: bdbfef3549 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3523a45b016f2084cf254e53ac1f3db51726396f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:23 +00:00
TreeHugger Robot
084332d5f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -s ours am: 8cacd20ff9 -s ours am: 93a574827c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7509849e0b745d86d8eb76af1f43034ae713a325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:15 +00:00
Bill Yi
b3e33ce188 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -s ours am: 3e4933f7c5 -s ours am: f620f08929 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95bd2c7606610303aa6856298cb3ff16789c0457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:26:06 +00:00
TreeHugger Robot
e26fe31344 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -s ours am: 7603b65c30 -s ours am: 6600f620f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iefbb1ac7809188039bf32a5bea9929dba2ad27de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:25:54 +00:00
Bill Yi
9b1ebb4756 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -s ours am: 414952c8fb -s ours am: 5cf1fe1319 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd83bf7831d8c533b26eaa3d656ea782cc8019f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:25:40 +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
The Android Open Source Project
a0e5dcde4c [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 skip reason: subject contains skip directive

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

Change-Id: I4d26eaab771ab439cc0f7533deda68b375e717b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:17:31 +00:00
The Android Open Source Project
8203d6dedc [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 skip reason: subject contains skip directive

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

Change-Id: Id7904c944a687f99b8ade48842ac51294ab7c4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:15:06 +00:00
Arc Wang
5dffbaabd5 [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 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: I1c5070faa67cd9d8bc7c629b2242ddf91afe5355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:14:35 +00:00