Commit Graph

107681 Commits

Author SHA1 Message Date
Arc Wang
ac534873d3 [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -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: I0acfc40d6b5ec0b685f5500ec2a2108fe3ad88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:25:29 +00:00
Arc Wang
21427989dc [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -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: Ic9f13dd1f7f0e7cc7d15303b0c109bf2cc6c5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:25:28 +00:00
Arc Wang
c0470839f1 [automerger skipped] Verify ringtone from ringtone picker is audio am: babe83e217 -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: I1993a307bccaecebf5366782a5c67253fcebfe70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:25:18 +00:00
Arc Wang
2752aa641b [automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev am: 8fba3eef08 -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: Ibc042ed231e8091e8d751ecb26f2abfd7e03c962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:25:06 +00:00
Arc Wang
296da54a32 [automerger skipped] [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5 am: becd92c1b0 -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: I4b8476f07c35fc42044f5cbab6fd52fd5e5ce228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:25:05 +00:00
Chaohui Wang
4ea320a09a Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 am: bf652e736b am: b08dfb2a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

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

Change-Id: I138d002b88bdd06e88c9fd3ebf46a0b7c19c4954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:15:49 +00:00
Bonian Chen
6c9bffbbe4 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 am: 129c031930 am: 6527793b66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I6379c30a482dbbae9f50af3189427dc436bb842d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:15:42 +00:00
Treehugger Robot
976d920650 Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df am: 1543eff3c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I2bf82109e104c1dfcd6656f086b2c8e9851c4a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:15:37 +00:00
TreeHugger Robot
3cdb14a480 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 am: 2d72c0e67e am: 808874d13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I523df29000b4b129a92f0a99098dfbef281f7f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:15:34 +00:00
Jack He
49e355a88e Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1 am: 36be40cb5f am: 8203f157ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: Ie093d5cc2b8b222178d2afcbee6e8eb0c8a56afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 00:15:21 +00:00
Arc Wang
8fba3eef08 Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into tm-dev
* changes:
  [automerged blank] Verify ringtone from ringtone picker is audio 2p: f288d3a31b 2p: 7fb8fc09b5
  [automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
  Verify ringtone from ringtone picker is audio
2022-05-11 00:04:32 +00:00
Arc Wang
3c2f252e62 Merge "Verify ringtone from ringtone picker is audio" into sc-v2-dev 2022-05-11 00:03:10 +00:00
Bill Yi
8a3c25db7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: 9825da46ff -s ours am: f86a4fa7b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d31835c8ca8e7383d8c55866f7ae6b0912a5e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:59:47 +00:00
Bill Yi
123a321028 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: b781b9c38d -s ours am: 1f18e77bb5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b6761821ac39d16c92bd9ce694bbdee5ede3a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:59:40 +00:00
Bill Yi
abe03493bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 059234f150 -s ours am: e065c811c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1dc4b3dd9bcc4fc37b7ae6d465492f7a0797f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:59:24 +00:00
Bill Yi
6cf5b23387 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 72fbe398ca -s ours am: 563f8694db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I722a12738905da124af5931b3d0faa32f7f7b7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:59:03 +00:00
TreeHugger Robot
23a2a791fa Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: 7e3c63dcd5 am: 0fa9182b25 am: 2f9fd60154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: I4827ab56db32f2ff006fe91ee259792121f18c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:54:00 +00:00
Bonian Chen
2ffee2ffea Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 2a1040e1e2 am: 2dad1245e6 am: 6b814f7e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: Ia2bfdcce432e88640823fcc83aa911fb73105860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:53:49 +00:00
Yanting Yang
49e861ad51 Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 799f7218cd am: 641b5b67b0 am: 50944a0bdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I5dc16e5805a87756567377e79ab09df44c01acad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:49:45 +00:00
Martijn Coenen
44baf8897d Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: d77f3426a2 am: 534a851e32 am: f246a543a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I7b88e20906d99dbf086eb27d0d377362685bdce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:49:39 +00:00
Menghan Li
4ebbf24f67 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 am: d83bb8f209 am: 6f804c9892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: Ieba808dd92195e0905b1250da4c5adc128576860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:49:28 +00:00
Tsung-Mao Fang
c00551fa9d Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 am: 695503018c am: f2f8618d62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

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

Change-Id: If8f0a915f938ddf220e51af43b633a252626454b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:34:35 +00:00
Treehugger Robot
1543eff3c2 Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3 am: 9bd8bec2df
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I107f2dda84bf0b9c63ad043d2cd4b87425375f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:34:29 +00:00
Jack He
8203f157ed Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1 am: 36be40cb5f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: Ie5794e6d02595c7f30c7dcf0a9979414f625200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:34:18 +00:00
TreeHugger Robot
a4d9992262 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 am: 97b69588df am: ba651dcdce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I9d29a0b912ffd8f5ea5b1c5908104a6c457c7c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:28:20 +00:00
Bill Yi
d83478d312 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 1fcabe2452 -s ours am: 54859fcba0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0706466ab17bca398f8191213693e822fcdf575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:28:10 +00:00
Bonian Chen
c88460e5a4 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: b0877cfa9a am: 66a399a0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I098382b0c8bad9b5bbb1ec3c112d5a2ea428c456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:17:53 +00:00
TreeHugger Robot
3e67f5ace2 [automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa -s ours am: dd348882d7 -s ours am: 8b8c3b45bd -s ours
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history

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

Change-Id: Icf09223307bc92e1b66118d1229a807883165f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:17:47 +00:00
SongFerng Wang
c507624bd6 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: 33f243f937 am: 8a60ff49d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: Id8fa725f10651f65f46f1e662f412d54aeac6539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:17:42 +00:00
Chaohui Wang
123e1df459 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 am: ec4a4248a2 am: 488dceed93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

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

Change-Id: Ie406b8c9f37091934ad1641524ec40492b654113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:16:45 +00:00
Treehugger Robot
9bd8bec2df Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb am: 4a0d0f29f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I5314d3f9e5201402a377cf7e61e36994a933f5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:16:36 +00:00
Jack He
36be40cb5f Merge "Cancel bonding upon back gesture." am: 3671fb8438 am: 56b5fa0fb1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: Iaf5b028bcdf0cd2252e914644bc05a4d3de446a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:16:22 +00:00
Jack He
55da62f36e Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951

Change-Id: I9d47c60b9588236b7923a33b3c1183b60896f0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:56:57 +00:00
Treehugger Robot
4a0d0f29f3 Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379

Change-Id: I5bb8460443557bdca8d23bae54353c4b1dee548d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:56:40 +00:00
Jack He
56b5fa0fb1 Merge "Cancel bonding upon back gesture." am: 3671fb8438
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046

Change-Id: I234953b29f4fb02af845243cce3131267acbf6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:56:31 +00:00
Chaohui Wang
aea7b51a1f Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 am: 0c6af8944e am: d7a05b918c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I56935f45e7f8e9ba3d4e640a01119b41c56ecaab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:30:11 +00:00
Bonian Chen
704123812b Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 am: e792ffe112 am: 6b83653c57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: Ib6e06b56de88fbc6504895ad2c2e2c9e780e2514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:29:56 +00:00
TreeHugger Robot
62c747036a Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 am: 83e71c22e7 am: 45396293a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: Iea10cc699f78eee911cdc0ae8cbe078788bcb260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:29:50 +00:00
Bill Yi
99339a0184 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: b6d3b477ea -s ours am: 92b1facae8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9884f25b6c0c4b80a18a2d5c4c3de010ab7d9b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:27:36 +00:00
Bill Yi
0161524621 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: bc00cbb900 -s ours am: 8607a8f1be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ffcbcfb86d10da9471d791ab67c2f8e12bfb30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:27:24 +00:00
Bill Yi
0f88104418 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 66101cee32 -s ours am: 630d664d54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02df30dd7fb3c8a4270f6dfd9d537e4adf331aee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:27:07 +00:00
Bill Yi
89ad77183e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 834950e817 -s ours am: eb9c5ef350 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dd33a562ed1bb12f2e104ca38f443b1cb17ed08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:26:52 +00:00
TreeHugger Robot
a0aba4d9b1 [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 skip reason: subject contains skip directive

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

Change-Id: Ifb1040ccf2ea0e96bcda7405ffb84a15d807b249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:24:13 +00:00
The Android Open Source Project
9f18783110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 49f9188b85 -s ours am: e826459b9a -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: I3858ff7d054b0b2badc2ea35b55acc5e84f08706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:24:11 +00:00
TreeHugger Robot
39bb8baaef [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 skip reason: subject contains skip directive

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

Change-Id: Iefb0c23254f44df7d1dea3d2b7fd1738a3f771b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:24:08 +00:00
The Android Open Source Project
bdbfef3549 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 74cd0c684a -s ours am: 5a5f7e98f9 -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: I28adce4cff77688a98a3b50be0cd5ca2d3b441e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:23:59 +00:00
TreeHugger Robot
93a574827c [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 skip reason: subject contains skip directive

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

Change-Id: I8257faa72bd852540f0ce6da107d79c87b3e9a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:23:53 +00:00